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