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

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