Merge branch 'master' into scenario-tests
Committed scenario_test.py
Renamed fmt->floatformat
Merged from scenario-tests