Drag&Drop fixes. Docs fix
Merge branch 'devel'
Merge branch 'master' into gh-pages