Drupal security update 7.18
Merge remote-tracking branch 'origin/master'