Port MODCLUSTER-332 fix from 1.2.x branch.
Merge pull request #41 from pferraro/master

[master] Port MODCLUSTER-332 fix from 1.2.x branch.