Merged trunk into branch. Includes r59729 to r59786.