Merge pull request #543 from TheBlueMatt/2020-03-513-warning