Merge branch 'MDL-69805-master' of https://github.com/dravek/moodle