hazelcast/hazelcast — pull request #2151 by kennymacleod (2014-03-27 23:17:06+00:00)
Title: #1795 Backport fix and test to maintenance-3.x branch

Backporting as requested in https://github.com/hazelcast/hazelcast/pull/2099