Further changes for 4.6.12, fixes #4, fixes #5, and fixes #6
Various locale updates