GLASSFISH-21261
Merge pull request #92 from davewinters/master

GLASSFISH-21261