Merge proposals dependent on lp://staging/~cjwatson/storm/six-moves

lp://staging/~cjwatson/storm/six-moves has no merge proposals.