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