Merge pull request #181 from sipa/fixcheckconf.