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