Merge branch 'MDL-62600-master' of git://github.com/mickhawkins/moodle