Merge branch 'asf-staging' into asf-site.
The main change is an update of the developer guide.