line endings
Merge branch 'master' of github.com:sleuthkit/autopsy
Merge remote-tracking branch 'upstream/master'