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

This reverts commit 5b863f92908ed968a22c77d1c092745c4a355a13.