Added -dev to debug builds of version
Merge branch 'master' into stats