Merge branch 'dragdrop-for-master' of git://git.luns.net.uk/moodle