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