Merged trunk into branch. Includes r60573 to r60575.