trying to fix drag&drop
Merge branch 'master' into gh-pages