Merge proposals dependent on lp:~paul-lucas/zorba/bug-994610

lp:~paul-lucas/zorba/bug-994610 has no merge proposals.