Merged trunk into branch. Includes r61240 to sha-1:178bd84.