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