Merge pull request #185 from apache/5.0.0/beta2

5.0.0/beta2