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