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