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