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