Merged v1.0 to master
authorRajesh <rajesh.velandy@riftio.com>
Thu, 24 Nov 2016 03:01:45 +0000 (22:01 -0500)
committerRajesh <rajesh.velandy@riftio.com>
Thu, 24 Nov 2016 03:02:07 +0000 (22:02 -0500)
Signed-off-by: Rajesh <rajesh.velandy@riftio.com>

Trivial merge