Merge branch 'master' into bs

and update changelog

diff --cc CHANGELOG
index 6c9ba624f9bb34b62fc75bb1276e376d9832280c,d5c72041cb2bdc566fdbb955dae58a44184a06c9..8ed28ad1571323605280b8516a5234e922ca9f09
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,15 -1,5 +1,15 @@@
- git-annex (7.20191115) UNRELEASED; urgency=medium
++git-annex (7.20191219) UNRELEASED; urgency=medium
 +
 +  * Optimised processing of many files, especially by commands like find
 +    and whereis that only report on the state of the repository. Commands
 +    like get also sped up in cases where they have to check a lot of
 +    files but only transfer a few files. Speedups range from 30-100%.
-   * Sped up many git-annex commands that operate on many files, by 
-     avoiding reserialization of keys.
-     find is 7% faster; whereis is 3% faster; and git-annex get when
-     all files are already present is 5% faster
-   * Stop displaying rsync progress, and use git-annex's own progress display
-     for local-to-local repo transfers.
++  * Added build dependency on the filepath-bytestring library.
++
++ -- Joey Hess <id@joeyh.name>  Wed, 18 Dec 2019 15:12:40 -0400
++
+ git-annex (7.20191218) upstream; urgency=medium
+ 
    * git-lfs: The url provided to initremote/enableremote will now be
      stored in the git-annex branch, allowing enableremote to be used without
      an url. initremote --sameas can be used to add additional urls.

diff --cc CmdLine/GitAnnex/Options.hs
Simple merge

diff --cc Command/Inprogress.hs
Simple merge

diff --cc git-annex.cabal
Simple merge