Merge pull request #121 from smillidge/master

Fix #120 GLASSFISH-20994