Merge tag '3.10.1'

it looks like the changes were already integrated by the previous merge,
which I screwed up with a stash.
This commit is contained in:
Dylan K. Taylor 2019-12-11 23:13:02 +00:00
commit 2714c7ab59

Diff Content Not Available