merge from trunk, no conflicts