upstream civicrm-4.2.12-drupal7

Change-Id: I6874d7c11941575b614d17079e611e201df3727c
upstream civicrm-4.2.13-drupal7

Change-Id: Icbac45621521166cd714010de87b80d2b4519d33
Merge remote-tracking branch 'origin/contrib' into HEAD

Change-Id: Ie6e268c7fc2a343b335a004a5533486930d7c4a8