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