Merge branch 'language' of gitlab.com:kingu/repomaker into language

Closed username-removed-231494 requested to merge kingu/repomaker:cherry-pick-e2c43847 into master