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