Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
fix legacy toLocaleString copy&paste error
fix legacy custom toLocaleString bug
fix toLocaleString legacy method bug 2
fix toLocaleString legacy method bug 3
Merge branch 'master' into devel