Merge pull request #501 from TheBlueMatt/2020-02-rescan-clarify