Merge pull request #28 from apache/asf-site

Catch up master to asf-site