merged commit from zhfeng https://github.com/zhfeng/jboss-as/commit/397dc57fc27660305ddd1549a0fc1dbd2af95c94