Merge pull request #413 from TheBlueMatt/2019-12-381-nits