Merge proposals dependent on lp:~christriant/switchboard/fix-1101263

lp:~christriant/switchboard/fix-1101263 has no merge proposals.