merging bugfix from trunk