Merged trunk into branch. Includes r61011 to r61020.