Merged trunk git into branch svn. Includes sha-1:af7a2a3 to sha-1:c6f425c.