Merge pull request #535 from TheBlueMatt/2020-03-462-nits