redact drupal behaviors
Merge branch 'master' into task-6