3.0 - Merge branch 'master' into 3.0

Feel free to review :smile: