Merge pull request #1 from apache/master

Syncing to upstream