Merges bugfixes from trunk.