Revert "Merge branch 'master' into develop"

This reverts commit 1422fce0dbdb4dd79d402692b277bae247496d8f, reversing
changes made to 9d2d1fffdfd4f8ed322d7ee293633d29807c5507.