Another smaller branch merged into next/pm before pull request.
Signed-off-by: NOlof Johansson <olof@lixom.net>