Merge pull request #620 from TheBlueMatt/2020-05-pre-bindings-cleanups