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

This reverts commit 64a8c042d1c166fac863b5f41d3c4909f2acf5e3.