Merge proposals dependent on lp:~stol/kicad/bug1499538_2

lp:~stol/kicad/bug1499538_2 has no merge proposals.