Merge branch 'master' into v1.0

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>