Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>