FormatString refactored
Merge branch 'master'