Don't crash on binary files
Merge master. Fix conficts