Update to r1641013 of the svn trunk.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26060 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac