Merge branch 'apache:3.0' into 3.0