Version number
Merge branch 'testing' into develop
misc