-- changed sanity check for locale en_US
Merge remote-tracking branch 'intranet-core/master'