Merge remote-tracking branch 'origin/master' into Bug-#212-Hosts-hovering-to-old-target-after-forcefull-movement-model-change