Updated through r2691.  #139