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