Merge branch 'dl/am-hg-locale'