Updates to trunk tracking branch.