Back to 7.x-dev
Drupal 7.18.
Merge commit '7.18' into develop