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