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