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