Merge pull request #358 from TheBlueMatt/2019-07-no-unsafe