Finally merged the branch 'apache20'(+'apache2') back to the main trunk.