Merge pull request #953 from suchpuppet/main