Sync master to develop

This should allow us to move from Git Flow to Github Flow and remove develop.