Bugfix: Excluded dirs were not being excluded
Merge branch 'exclude'