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