Bugfixes merged from trunk.