Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle