Merge proposals dependent on lp:~michael-sheldon/oxide/fix-1384357

lp:~michael-sheldon/oxide/fix-1384357 has no merge proposals.