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