Merge changes from trunk.