Merge latest changes from trunk.