Merge branch 'hotfix/update_bugsense'
Update mail server DNS name.
Merge branch 'hotfix/fix_broken_upload_pages' into develop