Merge pull request #759 from TheBlueMatt/2020-11-0.0.12