Merge branch 'dl/am-hg-locale' into maint