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