Merge remaining changes from trunk.