Merge pull request #200 from ebollens/7.x-2.x-webblocks

7.x 2.x webblocks
Merge branch '7.x-2.x-webblocks-dev' into 7.x-2.x-webblocks