Initial commit
Port changes from drupal-forwardport