Merge from trunk revision f35be1268c996d993ab0b4ff329734d467474445.