Merged trunk into branch. Includes r59786 to r59923.