Finish 1.0.x
Merge branch 'origin/master'
Merge branch develop.

Signed-off-by: Gnanakeethan Balasubramaniam <gnanakeethan@gmail.com>