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