Cleanup blockmap on update (fixes #889)
Merge pull request #895 from AudriusButkevicius/puller

Cleanup blockmap on update (fixes #889)