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

This reverts commit f514afaf7bef6b6710b8461f4f3b804c387c7979.