Merge branch 'asf-site' into 2.5.0-release