Merge pull request #1039 from sipa/fix_955