First master deploy

This PR just brings in the latest changes from `staging`, and will cause a deploy to Cloud Files