Merged trunk into branch. Includes r60599 to r61011.