Merge pull request #1569 from sylus/7.x-2.x

Updates for 2.x branch.
Merge branch '7.x-2.x' of https://github.com/sylus/wet-boew-drupal into 7.x-2.x