Merge pull request #3874 from tobiasd/20171009-checkversion