Originally committed to SVN as r970.
Originally committed to SVN as r945.
Originally committed to SVN as r944.