Initial upstream for Ciplex Drupal 7.