Merge "Display and parse numbers properly in all locales" into oc-dev