Update to trunk revision r2868