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