Put the commits in the wrong branch, so I'm merging squashed_feature and master together to keep master up-to-date.