Updated to latest trunk code.