Restoring the drag & drop.
Merge pull request #827 from ngodfraind/restore-dragdrop

Restoring the drag & drop.