Merge branch 'v1.1'
authorvelandy <rajesh.velandy@riftio.com>
Mon, 27 Feb 2017 20:02:31 +0000 (20:02 +0000)
committervelandy <rajesh.velandy@riftio.com>
Mon, 27 Feb 2017 20:03:04 +0000 (20:03 +0000)
Signed-off-by: velandy <rajesh.velandy@riftio.com>

Trivial merge