Merge branch 'master' into release
Merge pull request #1 from divyangbw/release

Merge branch 'master' into release