Merge proposals dependent on lp:~sipman-devel/sipman.net/testing

lp:~sipman-devel/sipman.net/testing has no merge proposals.