Merge pull request #898 from rustyswayne/1.4.1

Merges in contributions from @wderoo - more localization patches
Merge pull request #899 from rustyswayne/1.4.1

Merges @cssquirrel CustomerAddress fixes