Merge pull request #207 from apache/6.0.0/beta

Fix #206