Merge pull request #1045 from sipa/fastblocks2