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