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

This reverts commit 532ce43f9c9246b2f9c56e6376ac1537c5e240a1.