Merge pull request #411 from apache/5.0.1_patch

5.0.1 patch