Merge changes on master into develop

This pull request merges all changes made on the master branch into develop.
From then on master should always be behind develop, with no commits ahead.