Revert "Merge branch 'master' into develop"

This reverts commit fbe2eddc7ac1cc6038196d4b1c497fe84eee532e, reversing
changes made to b59965b971aa8216b3fa65e9dd8881be74a4a0a5.