Merge branch 'MDL-72852-master' of https://github.com/sarjona/moodle