Merge branch 'MDL-32148-master' of git://github.com/StudiUM/moodle