Merge branch 'master' of https://github.com/cljohnso/ehcache3 into issue/147
Merge branch 'issue/147' of https://github.com/cljohnso/ehcache3 into issue/147