Merge branch 'MDL-37220_dnd_icon' of git://github.com/davosmith/moodle