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

This reverts commit 3d44a1f30979080ef87fae3451945471c3d19d71.