25434ba84f
Most of these changes were only committed on the release branch and never pulled onto the master branch. Don't want to lose history.