Issue #396 - fix logic locale type reset
Merge branch 'master' into develop