Merge branch 'v1.1' 86/1286/1
authorvelandy <rajesh.velandy@riftio.com>
Fri, 10 Mar 2017 19:55:56 +0000 (19:55 +0000)
committervelandy <rajesh.velandy@riftio.com>
Fri, 10 Mar 2017 19:55:56 +0000 (19:55 +0000)

Trivial merge