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