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