Refs #4692; Move current trunk to plone25 branch
Merge branches 'master', 'plone25' and 'master' of https://github.com/collective/eea.cache
Merge branch 'master' of https://github.com/collective/eea.cache
Merge branch 'master' of https://github.com/collective/eea.cache
Merge branch 'master' of https://github.com/collective/eea.cache
Merge branch 'master' of https://github.com/collective/eea.cache
Merge branch 'master' of https://github.com/collective/eea.cache
Merge branch 'master' of https://github.com/collective/eea.cache
Merge branch 'master' of https://github.com/collective/eea.cache
Merge branch 'master' of https://github.com/collective/eea.cache