Merge proposals dependent on lp:~cwilson/spud/pythonbug

lp:~cwilson/spud/pythonbug has no merge proposals.