Merge branch 'master' into develop
Correct stable tag.
Merge branch 'develop'