Merge master into develop.

Both master and develop are currently the same, so they should effectively have each other as parents to make future merges easier.