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

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