Merge proposals dependent on lp:~mac9416/keryx/1.0

lp:~mac9416/keryx/1.0 has no merge proposals.