upstream civicrm-4.2.13-drupal7

Change-Id: Icbac45621521166cd714010de87b80d2b4519d33