Last merged with trunk revision: 627