Merge release back into master

Needed to get the version numbers sorted.

Dunno if this is already on @bturner-r7's TODO list today but figured I'd make it easy for him if it is.