Merge proposals dependent on lp:~dobey/dirspec/fix-pep8

lp:~dobey/dirspec/fix-pep8 has no merge proposals.