Merge branch 'develop'
Update a comment before release
Merge branch 'master' into develop