Merge branch 'refs/heads/master' into release
Hotfix: proper content type header for javascript translations
Merge branch 'refs/heads/beta11' into release
Merge branch 'refs/heads/release'