Drupal Changes
Merge https://github.com/paulgavin/rebeleyeball