Merge proposals dependent on lp:~jelmer/openchange/unstable

lp:~jelmer/openchange/unstable has no merge proposals.