Merge remote-tracking branch 'refs/remotes/apache/trunk' into trunk