Merge pull request #848 from sylus/master

Last major additions before RC2
Fix for wet-boew/wet-boew-drupal#834