Merge pull request #364 from TheBlueMatt/2019-07-no-unimpl