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