Merge branch 'w16_MDL-32377_m23_strcache' of git://github.com/skodak/moodle