Some improvements to make sure items will be routed as optimally as possible, even if they are inserted wrongly
Fixed shift-clicking
Lets see if this fixes stuff
Merge remote-tracking branch 'origin/master' into 1.7.2