Merged trunk into branch. Includes r60575 to r60599.