Drupal 6.30 fixes
Merge branch '6.30-security' into 6.x
Now onto Drupal 6.31-dev