Merge master into next (3 commits in master but in next)

I just noticed that some commits were on the master branch but not yet on the next branch due to a
pull request to master after those two branches diverged.