Merge branch 'master' into develop
Forgot to handle the DJ special case

Also improving the strings returned for the release types to match the site.
Merge branch 'hotfix-fix-dj-release'