Merge branch 'MDL-64438-master-4' of git://github.com/mihailges/moodle