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