Merge remote-tracking branch 'autobuild/master' into HEAD
remove one leftover mention of 'next'