Merge from trunk revision fba228e259dd5112851527f2dbb62c5601100985.