Merge pull request #2 from apache/develop

sync with original repo develop branch