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