Merge pull request #336 from apache/4.0-cleanup

4.0 cleanup