Merge pull request #11 from TheBlueMatt/2021-04-upstream-bump