Merge proposals dependent on lp:~oblomov/disper/misc-fixes

lp:~oblomov/disper/misc-fixes has no merge proposals.