Merge remote-tracking branch 'origin/v1.0'

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>