Merge remote-tracking branch 'apache-git/master'