Fix issue #884.
Merge pull request #885 from roSievers/patch-1

Fix issue #884 (Scaffolding with --bare)