Merges in contributions from @wderoo - more localization patches