Merge upstream `master` branch