Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
Merge pull request #1834 from croach/disable_untracked_files_dirty_fix

Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.