Reviewer: Tim Woodall This commit was SVN r1183.
This commit was SVN r1055.
This commit was SVN r1036.