Merged trunk into branch. Includes r61020 to r61240.