Number_format already exists, no need for this in migration
Merge branch 'release-2014-10-17' into develop