got tests passing in 1.9.3, 2.0.0 and still passing in 2.1.0
merging the 1.9.x, 2.0.x fix