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