Fix version check
Merge branch 'master' into dev