Modified Makeflow LOCAL behavior
Merge branch 'nhazekam-single_local'