merging bugfixes from trunk