Merge branch 'v1.1'
authorvelandy <rajesh.velandy@riftio.com>
Fri, 10 Feb 2017 22:30:47 +0000 (22:30 +0000)
committervelandy <rajesh.velandy@riftio.com>
Fri, 10 Feb 2017 22:30:47 +0000 (22:30 +0000)

Trivial merge