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