Merge branch 'apache:develop' into perl-5.26