Tweak for users without Localization installed.
Merge pull request #1684 from anti344/5.0.x

Tweak for users without BC-Localization installed.
Merge branch '5.0.x' into 6.0.x