BOY: don't use locale setting for numeric format
Merge with master