Merge branch 'MDL-62564-integration-master-1' of git://github.com/mihailges/moodle