Merge pull request #539 from TheBlueMatt/2020-03-static-remotekey