Merge @epaule's commits back into Staging

The commits on master should have been on staging first.