Merge dev into master in preparation for deleting dev

We'll develop off master from here on.