Merge pull request #1010 from sipa/fastblocks2