Fixed the file glob expansion so paths that contain '*' do not expand over files
Merge branch 'fix-file-glob-expansion'