Commits

Peter Korsgaard committed 7353967690bM
Merge branch 'next' Quite some conflicts, so here goes .. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Merge branch 'next' Quite some conflicts, so here goes .. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>