upstream civicrm-4.2.12-drupal7

Change-Id: I6874d7c11941575b614d17079e611e201df3727c