Fixed bug 276; mkdir blocks until required directory ready
Merge branch 'bug/276'