Merge pull request #975 from sipa/versioncheck