Merge proposals dependent on lp:~zorba-coders/zorba/bug-1021362

lp:~zorba-coders/zorba/bug-1021362 has no merge proposals.