Merge master into development
Created by: gorillainduction
This PR merges master into development. This is just for making the git history less confused.
Since commits have been cherry-picked and merged from different sources. Development really contains all changes from master, which makes this PR empty of diffs, but it provides a common commit in history between the respective branches.