Merge proposals dependent on lp://staging/~frank-niessink/squaremap/fix-for-taskcoach

lp://staging/~frank-niessink/squaremap/fix-for-taskcoach has no merge proposals.