Merge proposals dependent on lp:~spud/spud/update_options

lp:~spud/spud/update_options has no merge proposals.