Merge branch 'w07_MDL-24125_20_admintreecache' of git://github.com/skodak/moodle