Revert "Merge branch 'master' into 'master'"

This Merge Request complies with the Terms Of Service, regardless if this notice is kept on the MR or not.