mock 0.9 backport to F7/F8 -- Feb 1