Merge proposals dependent on lp:~zorba-coders/zorba/bug_967151

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