Branch 'apache2' has been already merged to the main trunk.