575910ce81d56fad2dd7b6292051e7410538605b
Also fix up the tests.
@mkovarik FYI.
Pull-Request has been merged by mikeb
Also fix up the tests.