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