Fixed problem with locale for date if language is System
Merge branch 'master' into bb
fixed problem after merged
fixed merged