Fix MODCLUSTER-428.
Merge pull request #115 from jfclere/master

Fix MODCLUSTER-428.