trunk tracking: update from r3934 to r3949

r3949 is also where 1.8 branched off