Beautifying master. It hasn't been beautified in some time. Please be sure to use Andrew's new beautify_changed_files_in_branch.py script to beautify your branch before merging into master from this point onward. (It's a very fast script -- it just takes a few seconds.)