Merge pull request #868 from sipa/fix_650