Merge pull request #131 from apache/development

Merge development into master