A number of merge conflicts, but hopefully they are all sorted out now. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>