Trying to fix some nasty drag behaviour
Fixes drag behaviour
Merge remote-tracking branch 'origin/master'