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