Merge pull request #335 from TheBlueMatt/2019-04-330-nits