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