"next" branch now merged to master

[Tom Rini]

As the subject says, I have now merged the next branch in to master.

-- 
Tom

signature.asc
Description: PGP signature