Fixed flags on the debug executables.
Merge branch 'master' into testing