Ported change from master
Merge pull request #901 from stellar/STR-decimal-places-port

Ported change from master