Merge pull request #370 from hynek/master

Fix test failure on 1.0.2d