Merge pull request #964 from sipa/fastblocks