Merge branch 'MDL-69525-master-1' of git://github.com/mihailges/moodle into master