merge from trunk

No match.