Merge branch 'master' (reverted from commit 05330a60baf5f3a6e65d14e41f10c0b3f344a24a)