Merge pull request #1 from wildfly/master

update