Merge branch 'v1.1' 72/972/1
authorvelandy <rajesh.velandy@riftio.com>
Tue, 17 Jan 2017 18:37:04 +0000 (18:37 +0000)
committervelandy <rajesh.velandy@riftio.com>
Tue, 17 Jan 2017 18:37:15 +0000 (18:37 +0000)
Signed-off-by: velandy <rajesh.velandy@riftio.com>

Trivial merge