Fixing cases where work_dir is None or False
Merge branch 'master' into jira-stuff