Merge branch 'v1.1' 74/974/1
authorvelandy <rajesh.velandy@riftio.com>
Tue, 17 Jan 2017 19:56:36 +0000 (19:56 +0000)
committervelandy <rajesh.velandy@riftio.com>
Tue, 17 Jan 2017 19:56:52 +0000 (19:56 +0000)
Signed-off-by: velandy <rajesh.velandy@riftio.com>

Trivial merge