Merge remote-tracking branch 'apache/trunk' into MR-2841