Closes #518. (Upgrade Drupal Core to 7.18)

#518