Last merged with trunk revision:

579