Revert "Merging upstream/master"

This reverts commit 95aa08605b444d1866c6765284c0fa147456ba66.