Merge branch 'v1.1'
authorvelandy <rajesh.velandy@riftio.com>
Mon, 23 Jan 2017 16:26:01 +0000 (16:26 +0000)
committerroot <root@SO-ub.lxd>
Mon, 23 Jan 2017 16:30:56 +0000 (16:30 +0000)
Signed-off-by: velandy <rajesh.velandy@riftio.com>

Trivial merge