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