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