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

This reverts commit 1f668b642de0b96cb521980559d6266db0018351.