Merge branch 'v2.0'
authorRajesh Velandy <rajesh.velandy@riftio.com>
Thu, 6 Jul 2017 16:23:01 +0000 (16:23 +0000)
committervelandy <rajesh.velandy@riftio.com>
Thu, 6 Jul 2017 16:45:52 +0000 (16:45 +0000)
Signed-off-by: velandy <rajesh.velandy@riftio.com>

Trivial merge