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