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