Merge branch 'MDL-67812-master-latest-3' of git://github.com/mihailges/moodle