Merge pull request #673 from guewen/lp-1319285-translation-overwrite-module-update