* Merge from mainline (rev 116884).