Fix for WildFly 8.1.0.CR2
Merge pull request #425 from stianst/master

Fix for WildFly 8.1.0.CR2