Merge pull request from p2pu/master Release 2020-07-14 trailing changes