Merge branch '1.5-i18n-updates' into 1.5

Closes #356