Merge pull request #99 from apache/develop

Merge develop into master, ahead of making it the default master branch