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

This reverts commit b19578a90b05733a6ceaf18206ad62810302cbe3.