Spin if directory is locked
Merge branch 'master' into linux