Merge branch 'MDL-22504_drag_and_drop_upload_integration' of git://github.com/davosmi...