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