Bug fix: checking the right property to detect locale changes
Bumped version for release of 3.6.3
Merge branch 'release/3.6.3' into develop
Bumped version for development after release.