merge changes from trunk in