Merge pull request #1294 from eclipse-ee4j/RELEASE_401