This commit was SVN r32292.
This will soon need to be converted to git, but it is a good starting point, anyway. This commit was SVN r32291.