Merge branch 'v1.1'
authorvelandy <rajesh.velandy@riftio.com>
Thu, 26 Jan 2017 20:11:48 +0000 (20:11 +0000)
committervelandy <rajesh.velandy@riftio.com>
Thu, 26 Jan 2017 20:12:08 +0000 (20:12 +0000)
Signed-off-by: velandy <rajesh.velandy@riftio.com>

Trivial merge