Pull in changes from trunk.