Merge branch 'master' into v1.0 67/567/1
authorRajesh <rajesh.velandy@riftio.com>
Sat, 22 Oct 2016 12:42:59 +0000 (12:42 +0000)
committerRajesh Velandy <rajesh.velandy@riftio.com>
Sat, 22 Oct 2016 12:50:53 +0000 (12:50 +0000)
Signed-off-by: Rajesh Velandy <rajesh.velandy@riftio.com>
Author:    rajesh.velandy@riftio.com
Date:      Sat Oct 22 12:42:59 2016 +0000
Signed-off-by: Rajesh Velandy <rajesh.velandy@riftio.com>

Trivial merge