merging bugfix from trunk

No match.