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