Ehcache 2.6.3
Merge branch 'refs/heads/trunk'