wildfly/wildfly — pull request #4511 by n1hility (2013-05-16 04:40:14+00:00)
Title: Take 3 of WFLY-266

Don't merge this until the testsuite passes