This came in via "UBUNTU: Rebase to v4.2-rc3", but I'm not
sure why.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>