Merge branch 'master' of C:\App\sniffsters-profile with conflicts.
Scope Files works well