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

This reverts commit 45574b9c672cf5af986e6863dd7c47c573b55b36.