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

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