Correct rebase in a hurry
Merge branch 'master' into next