Check if directory exists first.
Merge branch 'master' into work