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