Merge branch 'custom-translations-fix' into 'master'

custom-translations-fix

See merge request !100
5 jobs for master in 3 minutes and 27 seconds (queued for 1 second)