dropzone-refactoring
Merge branch 'dropzone-refactoring' into rc-0.4.0