Merge branch 'master' into develop
Version has been changed because of release 1.0.1.79.
Merge branch 'develop'