Bug 937005 - Make the original fix actually do something. r=ted
Bug 943728 - Fixup for multilocale builds. r=me
Merge m-c to b-i.