AndrewVSutherland Merge pull request #3591 from LMFDB/master …