Merge branch 'hotfix-change-password'
Publish server modifications.
Merge branch 'hotfix-comment-media'
Merge branch 'master' into develop