AndrewVSutherland Merge pull request #3590 from LMFDB/master …