Revert "Merge branch 'master' into develop"

This reverts commit f52a02d1a037af401f0289ed820987498d651a2d, reversing
changes made to 1cc621fa8a6a613b0d32ddeb9d91c94344a113ba.