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