Merge branch 'w07_MDL-38059_m25_cachedir' of git://github.com/skodak/moodle