Fix for disabling debug mode for an application.
Merge remote-tracking branch 'origin/pr/34'