Merges bugfixes from trunk.

No match.