Match directory name instead of whole path.
Merge branch 'atykhonov-v0.6-wip' into v0.6-wip