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