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