Merge from trunk. Copyright year.