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