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