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