Merge branch 'MDL-59746-master' of git://github.com/Dagefoerde/moodle