Update to trunk revision r3064.