Update changes to use a more reasonable formatting.
Merge branch 'master' into consistent_setup_and_teardown_behavior
Update changes.