Add missing language parameters
Merge branch 'master' into heroku