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