This commit was SVN r3665.
LANL / HLRS copyrights are figured out, and then can probably be deleted. This commit was SVN r3656.