Merge pull request #2 from apache/trunk

Merging latest changes to trunk