Merge master into develop

The develop branch is behind master. This brings the changes from master into the develop branch. This is helpful because it puts the commits from master into develop (there aren't many merge conflicts because similar changes have already been made on the develop branch).