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