Merge branch 'master' of https://github.com/infinispan/infinispan
ISPN-1342 WIP...