23aa3d90 by Adam Heath

Really truly fix it all; I've actually run the test suite now. :|

1 parent 025d1b0a