Merge pull request #111 from simonpasquier/restore-block-policy

Restore block policy