Merge pull request #522 from sipa/minorfix