Brewfile: Install `p7zip` (i.e. `7z` etc.)
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Brewfile: Install `p7zip` (i.e. `7z` etc.)