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