Merge remote-tracking branch 'apache/master'