Merge pull request #41 from smillidge/master

Fix for GLASSFISH-21242