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