Merge proposals dependent on lp:~austinpowers/jedimud/Code_clean_up

lp:~austinpowers/jedimud/Code_clean_up has no merge proposals.