Do not highlight when drag and drop
Merge branch 'master' into devel