Merge branch 'MDL-38047-master' of git://github.com/damyon/moodle