Merge branch 'master' into develop

* master:
Merge branch 'master' into develop
Merge branch 'develop'

* develop: