Merge branch 'wip-MDL-31885-smartcache' of git://github.com/marinaglancy/moodle