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