Merge pull request #1087 from sipa/fix_1086