Merge proposals dependent on lp:~stewart/drizzle/bug804566

lp:~stewart/drizzle/bug804566 has no merge proposals.