Fixed building Release solution on Debug builds
Merge branch 'master' into dev