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

This reverts commit cbd4269a7d83aeb055bef90888d137d6b5892d79.