Merge branch 'upstream-bzip2' into update-bzip2

* upstream-bzip2:
  bzip2 2019-07-13 (6a8690fc)