Merge proposals dependent on lp://qastaging/~pcwalton-mimiga/docky/devel

lp://qastaging/~pcwalton-mimiga/docky/devel has no merge proposals.