Merging a squashed version of the feature-formatter_revisited branch back into master.