fanquake Merge pull request #1727 from kristapsk/kristapsk-0.21.2-signed