Merge branch 'v2.0'
authorvelandy <rajesh.velandy@riftio.com>
Wed, 2 Aug 2017 19:31:04 +0000 (15:31 -0400)
committervelandy <rajesh.velandy@riftio.com>
Wed, 2 Aug 2017 19:31:50 +0000 (15:31 -0400)
Signed-off-by: velandy <rajesh.velandy@riftio.com>

Trivial merge