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

This reverts commit 39fd7a7798cd13622824d7331fdb8a99e6b0a458.