Merged trunk into branch. Includes r59923 to r60573.