Revert "Revert "Merge remote-tracking branch 'origin/master'""

This reverts commit 895c7ac0bd581506f9cf8f386fd97fb52060d2a3.