Merge pull request #857 from sylus/master

Fixes wet-boew/wet-boew-drupal#808
Fixes wet-boew/wet-boew-drupal#830