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