ee23995004
We fold in the new black changes also. Change-Id: I326a0529b6b9f2aa9fbc33862567131839460797 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>