Moved version detection to instance module
Merge branch 'master' into 1.7.1
Bumped version to 1.7.1