add https://github.com/wildfly/wildfly/pull/5660
Merge remote-tracking branch 'origin/master'