v6.0.4
e31f1295 · Merge pull request #2425 from Blair2004/v6.0.x ·