Updating all the stuff from master back into develop

The last release went through a weird set of branches that didn't include develop, and now develop is behind.