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

This reverts commit 07f5e60beb4ec495f484b17f0ec5da566bbd8790.