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