Merge proposals dependent on lp:~testtools-committers/testtools/trunk

lp:~testtools-committers/testtools/trunk has no merge proposals.