Merge pull request #27 from apache/develop

Merge into master ready to build site