Merge branch 'MDL-31112_dndupload_folder_detection' of git://github.com/davosmith...