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