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