Merge branch 'MDL-72606-master' of https://github.com/lucaboesch/moodle