Updated versions
Now compatible with 6.2
Merge branch 'master' into dev