diff --git a/sites/all/modules/drupalorg/drupalorg/drupalorg.module b/sites/all/modules/drupalorg/drupalorg/drupalorg.module
index bbdc8d6..9734a82 100755
--- a/sites/all/modules/drupalorg/drupalorg/drupalorg.module
+++ b/sites/all/modules/drupalorg/drupalorg/drupalorg.module
@@ -1073,7 +1073,7 @@ function drupalorg_theme() {
 /**
  * Implements hook_form_alter().
  */
-function drupalorg_form_alter(&$form, $form_state, $form_id) {
+function drupalorg_form_alter(&$form, &$form_state, $form_id) {
   // Force a revision log entry when editing existing book nodes.
   if ($form_id == 'book_node_form' && isset($form['revision_information']['log']) && arg(1) != 'add') {
     $form['revision_information']['log']['#required'] = TRUE;
@@ -1112,6 +1112,27 @@ function drupalorg_form_alter(&$form, $form_state, $form_id) {
       $form['Personal information']['profile_languages']['#default_value'] = explode('; ', $form['Personal information']['profile_languages']['#default_value']);
       $form['#submit'] = array_merge(array('drupalorg_profile_fix_languages'), $form['#submit']);
     }
+    if ($form['#user_category'] == 'account' && isset($form['field_current_company_org'])) {
+      unset($form['field_current_company_org']);
+    } else if ($form['#user_category'] == 'Work') {
+      // Get the current company or organization(s) field
+      $edit = array();
+      field_attach_form('user', $form['#user'], $edit, $form_state, NULL, array('field_name' => 'field_current_company_org'));
+
+      // Remove old field -- TODO: we need to delete this field entirely
+      unset($form['Work']['profile_current_company_organization']);
+
+      // Fix weights
+      $i = 1;
+      $elements = element_children($form['Work'], true);
+      foreach ($elements as $element) {
+        $form['Work'][$element]['#weight'] = ($i == 2) ? ++$i : $i++;
+      }
+
+      // Add Current company or organization(s) field.
+      $form['Work']['field_current_company_org'] = $edit['field_current_company_org'];
+      $form['Work']['field_current_company_org']['#weight'] = 2;
+    }
   }
 
   // Add extra choices to the dblog settings selector
@@ -1507,9 +1528,74 @@ function drupalorg_block_render($module, $delta) {
 /**
  * Form constructor for the Drupalorg custom settings form.
  */
+function drupalorg_settings_form_batch_update_current_company_submit(&$form, &$form_state) {
+  $batch = array(
+    'title' => t('Migrate "Current company or organization"'),
+    'operations' => array(
+      array('drupalorg_batch_update_current_company', array())
+    ),
+    'finished' => 'drupalorg_batch_update_current_company_finished',
+  );
+
+  batch_set($batch);
+}
+
+function drupalorg_batch_update_current_company_finished($success, $results, $operations) {
+  if ($success) {
+    $message = format_plural(count($results), 'One user profile migrated.', '@count user profiles migrated.');
+  }
+  else {
+    // An error occurred.
+    // $operations contains the operations that remained unprocessed.
+    $error_operation = reset($operations);
+    $message = t('An error occurred while processing %error_operation with arguments: @arguments',
+        array('%error_operation' => $error_operation[0], '@arguments' => print_r($error_operation[1], TRUE)));
+  }
+
+  drupal_set_message($message);
+}
+
+function drupalorg_batch_update_current_company(&$context) {
+  if (empty($context['sandbox'])) {
+    $context['sandbox']['progress'] = 0;
+    $context['sandbox']['max'] = db_query("SELECT COUNT(*) FROM {users} u INNER JOIN {profile_value} pv ON (u.uid = pv.uid) LEFT JOIN {field_data_field_current_company_org} cco ON (cco.entity_id = u.uid) WHERE u.status = 1 AND pv.fid = 72 AND pv.value <> '' AND cco.field_current_company_org_value IS NULL")->fetchField();
+  } else if ($context['sandbox']['progress'] == $context['sandbox']['max']) {
+    return;
+  }
+
+  $batch_size = 20;
+  $rows = db_query_range("SELECT u.uid, pv.value as company FROM {users} u INNER JOIN {profile_value} pv ON (u.uid = pv.uid) LEFT JOIN {field_data_field_current_company_org} cco ON (cco.entity_id = u.uid) WHERE u.status = 1 AND pv.fid = 72 AND pv.value <> '' AND cco.field_current_company_org_value IS NULL ORDER BY u.uid ASC", 0, $batch_size);
+
+  foreach ($rows as $row) {
+    $context['sandbox']['progress']++;
+
+    $account = user_load($row->uid);
+    $wrapper = entity_metadata_wrapper('user', $account);
+    $wrapper->field_current_company_org = array($row->company);
+    $wrapper->save();
+
+    $context['results'][] = $row->uid;
+    $context['message'] = "Migrated user \"{$row->uid}\" -- " . $context['sandbox']['progress'] . '/' . $context['sandbox']['max'];
+
+    if ($context['sandbox']['progress'] < $context['sandbox']['max']) {
+      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
+  }
+}
+
 function drupalorg_settings_form($form, &$form_state) {
   $form = array();
 
+  $form['batch_update_current_company'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Migrate "Current company or organization"'),
+    '#description' => t('Migrate the "Current company or organization" user profile field to the new multi-value field using the Drupal Batch API. This may take a while to complete.'),
+  );
+  $form['batch_update_current_company']['batch_update_current_company_submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Begin migration'),
+    '#submit' => array('drupalorg_settings_form_batch_update_current_company_submit'),
+  );
   $form['featured'] = array(
     '#type' => 'fieldset',
     '#title' => t('Featured projects'),
@@ -1809,7 +1895,9 @@ function drupalorg_node_view($node, $view_mode = 'full') {
         '#markup' => '',
         '#suffix' => '</div>',
       );
-      $result = db_query("SELECT pv.uid, u.name, u.created, pv_title.value title, hug.field_user_geolocation_lat, hug.field_user_geolocation_lng FROM {profile_value} pv INNER JOIN {users} u ON u.uid = pv.uid AND u.status = 1 LEFT JOIN {profile_value} pv_title ON pv_title.uid = u.uid AND pv_title.fid = 8 LEFT JOIN {field_data_field_user_geolocation} hug ON hug.entity_id = u.uid WHERE pv.value = :company AND pv.fid = :field_id", array(':company' => $node->title, ':field_id' => '72'));
+
+      $result = db_query("SELECT cco.field_current_company_org_value, u.uid, u.name, u.created, pv_title.value title, hug.field_user_geolocation_lat, hug.field_user_geolocation_lng FROM {field_data_field_current_company_org} cco INNER JOIN {users} u ON u.uid = cco.entity_id AND u.status = 1 LEFT JOIN {profile_value} pv_title ON pv_title.uid = u.uid AND pv_title.fid = 8 LEFT JOIN {field_data_field_user_geolocation} hug ON hug.entity_id = u.uid WHERE cco.entity_type = 'user' AND cco.bundle = 'user' AND cco.field_current_company_org_value = :company", array(':company' => $node->title));
+
       foreach ($result as $account) {
         // Name & title
         $content['aside'][$account->uid . 'name'] = array(
@@ -2190,94 +2278,112 @@ function drupalorg_user_view($account, $view_mode) {
     ),
   );
 
+  // Move "Current company or organization(s)" field to the Work section
+  $account->content['Work']['field_current_company_org'] = $account->content['field_current_company_org'];
+  $account->content['Work']['field_current_company_org']['#weight'] = $account->content['Work']['profile_job']['#weight'] + 1;
+
   // Link organization to organization node, if it exists.
-  if (!empty($account->profile_current_company_organization)) {
-    $nid = db_query("SELECT nid FROM {node} WHERE status = :status AND type = :type AND title = :title", array(':status' => 1, ':type' => 'organization', ':title' => $account->profile_current_company_organization))->fetchField();
-    if ($nid != 0) {
-      $organization = node_load($nid);
-      $link = check_plain($organization->title);
-      if (isset($organization->field_logo[$organization->language][0])) {
-        $link = theme('image_style', array('style_name' => 'grid-3', 'path' => $organization->field_logo[$organization->language][0]['uri'], 'alt' => $organization->title, 'title' => $organization->title));
-      }
-      $account->content['Work']['profile_current_company_organization']['#markup'] = l($link, 'node/' . $nid, array('html' => TRUE));
-    }
+  $companies = field_get_items('user', $account, 'field_current_company_org', $account->language);
+  if (!empty($companies)) {
+    $company_logos = '';
+
+    foreach ($companies as $company_index => $company) {
+      $company = $company['value'];
+      $nid = db_query("SELECT nid FROM {node} WHERE status = :status AND type = :type AND title = :title", array(':status' => 1, ':type' => 'organization', ':title' => $company))->fetchField();
+
+      if ($nid != 0) {
+        $organization = node_load($nid);
+        $link = check_plain($organization->title);
+        if (isset($organization->field_logo[$organization->language][0])) {
+          $link = theme('image_style', array('style_name' => 'grid-3', 'path' => $organization->field_logo[$organization->language][0]['uri'], 'alt' => $organization->title, 'title' => $organization->title));
+        }
 
-    // Organization and Supporting/Technology partner memberships
-    if (drupalorg_has_civimembership($account->profile_current_company_organization, 'Organization')) {
-      $placeholders = array(
-        '@org_name' => $account->profile_current_company_organization,
-      );
-      if ($account->uid === $user->uid) {
-        $content['aside']['membership'][] = array(
-          '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-organization.png') . '" alt="' . t('Drupal Association Organization Member') . '" /></a></div><div class="da-membership"><p>',
-          '#markup' => t('@org_name is a member of the <a href="https://association.drupal.org/">Drupal Association</a>. Thanks to your support, Drupal.org infrastructure and other large community initiatives are funded', $placeholders),
-          '#suffix' => '</p></div></div>',
-        );
-      }
-      else {
-        $content['aside']['membership'][] = array(
-          '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-organization.png') . '" alt="' . t('Drupal Association Organization Member') . '" /></a></div><div class="da-membership"><p>',
-          '#markup' => t('@org_name is an <a href="https://association.drupal.org/membership">Organization Member</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. We’re supporting the Drupal.org infrastructure and other large community initiatives.', $placeholders),
-          '#suffix' => '</p></div></div>',
-        );
+        $company_logos .= l($link, 'node/' . $nid, array('html' => TRUE));
+        $account->content['Work']['field_current_company_org'][$company_index]['#markup'] = l($organization->title, 'node/' . $organization->nid);
       }
-    }
-    if (drupalorg_has_civimembership($account->profile_current_company_organization, 'Supporting Partner')) {
-      $placeholders = array(
-        '@org_name' => $account->profile_current_company_organization,
-      );
-      if ($account->uid === $user->uid) {
-        $content['aside']['membership'][] = array(
-          '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-supporting.png') . '" alt="' . t('Drupal Association Supporting Partner') . '" /></a></div><div class="da-membership"><p>',
-          '#markup' => t('Thanks for being a <a href="https://association.drupal.org/supporting-partners">Supporting Partner</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. @org_name helps fund key initiatives that strategically support and grow the Drupal community.', $placeholders),
-          '#suffix' => '</p></div></div>',
+
+      // Organization and Supporting/Technology partner memberships
+      if (drupalorg_has_civimembership($company, 'Organization')) {
+        $placeholders = array(
+          '@org_name' => $company,
         );
+        if ($account->uid === $user->uid) {
+          $content['aside']['membership'][] = array(
+            '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-organization.png') . '" alt="' . t('Drupal Association Organization Member') . '" /></a></div><div class="da-membership"><p>',
+            '#markup' => t('@org_name is a member of the <a href="https://association.drupal.org/">Drupal Association</a>. Thanks to your support, Drupal.org infrastructure and other large community initiatives are funded', $placeholders),
+            '#suffix' => '</p></div></div>',
+          );
+        }
+        else {
+          $content['aside']['membership'][] = array(
+            '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-organization.png') . '" alt="' . t('Drupal Association Organization Member') . '" /></a></div><div class="da-membership"><p>',
+            '#markup' => t('@org_name is an <a href="https://association.drupal.org/membership">Organization Member</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. We’re supporting the Drupal.org infrastructure and other large community initiatives.', $placeholders),
+            '#suffix' => '</p></div></div>',
+          );
+        }
       }
-      else {
-        $content['aside']['membership'][] = array(
-          '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-supporting.png') . '" alt="' . t('Drupal Association Supporting Partner') . '" /></a></div><div class="da-membership"><p>',
-          '#markup' => t('As a <a href="https://association.drupal.org/supporting-partners">Supporting Partner</a>, @org_name helps fund the <a href="https://association.drupal.org/">Drupal Association\'s</a> key initiatives that strategically support and grow the Drupal community.', $placeholders),
-          '#suffix' => '</p></div></div>',
+      if (drupalorg_has_civimembership($company, 'Supporting Partner')) {
+        $placeholders = array(
+          '@org_name' => $company,
         );
+        if ($account->uid === $user->uid) {
+          $content['aside']['membership'][] = array(
+            '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-supporting.png') . '" alt="' . t('Drupal Association Supporting Partner') . '" /></a></div><div class="da-membership"><p>',
+            '#markup' => t('Thanks for being a <a href="https://association.drupal.org/supporting-partners">Supporting Partner</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. @org_name helps fund key initiatives that strategically support and grow the Drupal community.', $placeholders),
+            '#suffix' => '</p></div></div>',
+          );
+        }
+        else {
+          $content['aside']['membership'][] = array(
+            '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-supporting.png') . '" alt="' . t('Drupal Association Supporting Partner') . '" /></a></div><div class="da-membership"><p>',
+            '#markup' => t('As a <a href="https://association.drupal.org/supporting-partners">Supporting Partner</a>, @org_name helps fund the <a href="https://association.drupal.org/">Drupal Association\'s</a> key initiatives that strategically support and grow the Drupal community.', $placeholders),
+            '#suffix' => '</p></div></div>',
+          );
+        }
       }
-    }
-    if (drupalorg_has_civimembership($account->profile_current_company_organization, 'Supporting Partner Premium')) {
-      $placeholders = array(
-        '@org_name' => $account->profile_current_company_organization,
-      );
-      if ($account->uid === $user->uid) {
-        $content['aside']['membership'][] = array(
-          '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-premium-supporting.png') . '" alt="' . t('Drupal Association Premium Supporting Partner') . '" /></a></div><div class="da-membership"><p>',
-          '#markup' => t('Thanks for being a <a href="https://association.drupal.org/supporting-partners">Premium Supporting Partner</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. @org_name helps fund key initiatives that strategically support and grow the Drupal community.', $placeholders),
-          '#suffix' => '</p></div></div>',
+      if (drupalorg_has_civimembership($company, 'Supporting Partner Premium')) {
+        $placeholders = array(
+          '@org_name' => $company,
         );
+        if ($account->uid === $user->uid) {
+          $content['aside']['membership'][] = array(
+            '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-premium-supporting.png') . '" alt="' . t('Drupal Association Premium Supporting Partner') . '" /></a></div><div class="da-membership"><p>',
+            '#markup' => t('Thanks for being a <a href="https://association.drupal.org/supporting-partners">Premium Supporting Partner</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. @org_name helps fund key initiatives that strategically support and grow the Drupal community.', $placeholders),
+            '#suffix' => '</p></div></div>',
+          );
+        }
+        else {
+          $content['aside']['membership'][] = array(
+            '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-premium-supporting.png') . '" alt="' . t('Drupal Association Premium Supporting Partner') . '" /></a></div><div class="da-membership"><p>',
+            '#markup' => t('Thanks for being a <a href="https://association.drupal.org/supporting-partners">Premium Supporting Partner</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. @org_name helps fund key initiatives that strategically support and grow the Drupal community.', $placeholders),
+            '#suffix' => '</p></div></div>',
+          );
+        }
       }
-      else {
-        $content['aside']['membership'][] = array(
-          '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-premium-supporting.png') . '" alt="' . t('Drupal Association Premium Supporting Partner') . '" /></a></div><div class="da-membership"><p>',
-          '#markup' => t('Thanks for being a <a href="https://association.drupal.org/supporting-partners">Premium Supporting Partner</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. @org_name helps fund key initiatives that strategically support and grow the Drupal community.', $placeholders),
-          '#suffix' => '</p></div></div>',
+      if (drupalorg_has_civimembership($company, 'Technology Partner')) {
+        $placeholders = array(
+          '@org_name' => $company,
         );
+        if ($account->uid === $user->uid) {
+          $content['aside']['membership'][] = array(
+            '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-technology-partner.png') . '" alt="' . t('Drupal Association Technology Partner') . '" /></a></div><div class="da-membership"><p>',
+            '#markup' => t('Thanks for being a <a href="https://association.drupal.org/technology-partners">Technology Partner</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. @org_name helps financially support Drupal.org team, making it possible to maintain and improve the site.', $placeholders),
+            '#suffix' => '</p></div></div>',
+          );
+        }
+        else {
+          $content['aside']['membership'][] = array(
+            '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-technology-partner.png') . '" alt="' . t('Drupal Association Technology Partner') . '" /></a></div><div class="da-membership"><p>',
+            '#markup' => t('As a <a href="https://association.drupal.org/technology-partners">Technology Partner</a>, @org_name helps financially support Drupal.org team, making it possible to maintain and improve the site.', $placeholders),
+            '#suffix' => '</p></div></div>',
+          );
+        }
       }
     }
-    if (drupalorg_has_civimembership($account->profile_current_company_organization, 'Technology Partner')) {
-      $placeholders = array(
-        '@org_name' => $account->profile_current_company_organization,
-      );
-      if ($account->uid === $user->uid) {
-        $content['aside']['membership'][] = array(
-          '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-technology-partner.png') . '" alt="' . t('Drupal Association Technology Partner') . '" /></a></div><div class="da-membership"><p>',
-          '#markup' => t('Thanks for being a <a href="https://association.drupal.org/technology-partners">Technology Partner</a> of the <a href="https://association.drupal.org/">Drupal Association</a>. @org_name helps financially support Drupal.org team, making it possible to maintain and improve the site.', $placeholders),
-          '#suffix' => '</p></div></div>',
-        );
-      }
-      else {
-        $content['aside']['membership'][] = array(
-          '#prefix' => '<div class="clearfix"><div class="da-membership-badge"><a href="https://association.drupal.org/membership"><img src="' . url(drupal_get_path('module', 'drupalorg') . '/images/association-technology-partner.png') . '" alt="' . t('Drupal Association Technology Partner') . '" /></a></div><div class="da-membership"><p>',
-          '#markup' => t('As a <a href="https://association.drupal.org/technology-partners">Technology Partner</a>, @org_name helps financially support Drupal.org team, making it possible to maintain and improve the site.', $placeholders),
-          '#suffix' => '</p></div></div>',
-        );
-      }
+
+    if (!empty($company_logos)) {
+      $account->content['Work']['field_current_company_org_logos']['#markup'] = $company_logos;
+      $account->content['Work']['field_current_company_org_logos']['#weight'] = $account->content['Work']['field_current_company_org']['#weight'] + 1;
     }
   }
 
diff --git a/sites/all/modules/drupalorg/features/drupalorg_user/drupalorg_user.features.field.inc b/sites/all/modules/drupalorg/features/drupalorg_user/drupalorg_user.features.field.inc
index 56527e3..2ce1b83 100644
--- a/sites/all/modules/drupalorg/features/drupalorg_user/drupalorg_user.features.field.inc
+++ b/sites/all/modules/drupalorg/features/drupalorg_user/drupalorg_user.features.field.inc
@@ -10,6 +10,69 @@
 function drupalorg_user_field_default_fields() {
   $fields = array();
 
+  // Exported field: 'user-user-field_current_company_org'.
+  $fields['user-user-field_current_company_org'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_current_company_org',
+      'foreign keys' => array(
+        'format' => array(
+          'columns' => array(
+            'format' => 'format',
+          ),
+          'table' => 'filter_format',
+        ),
+      ),
+      'indexes' => array(
+        'format' => array(
+          0 => 'format',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'text',
+      'settings' => array(
+        'max_length' => '255',
+      ),
+      'translatable' => '0',
+      'type' => 'text',
+    ),
+    'field_instance' => array(
+      'bundle' => 'user',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'text',
+          'settings' => array(),
+          'type' => 'text_default',
+          'weight' => 1,
+        ),
+      ),
+      'entity_type' => 'user',
+      'field_name' => 'field_current_company_org',
+      'label' => 'Current company or organization(s)',
+      'required' => 0,
+      'settings' => array(
+        'text_processing' => '0',
+        'user_register_form' => 0,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'text',
+        'settings' => array(
+          'size' => '60',
+        ),
+        'type' => 'text_textfield',
+        'weight' => '31',
+      ),
+    ),
+  );
+
   // Exported field: 'user-user-field_user_geolocation'.
   $fields['user-user-field_user_geolocation'] = array(
     'field_config' => array(
@@ -65,6 +128,7 @@ function drupalorg_user_field_default_fields() {
 
   // Translatables
   // Included for use with string extractors like potx.
+  t('Current company or organization(s)');
   t('Location');
   t('Your general location may appear on the Drupal.org home page map, and potentially more future uses.');
 
diff --git a/sites/all/modules/drupalorg/features/drupalorg_user/drupalorg_user.info b/sites/all/modules/drupalorg/features/drupalorg_user/drupalorg_user.info
index 42c6c8c..95a1b98 100644
--- a/sites/all/modules/drupalorg/features/drupalorg_user/drupalorg_user.info
+++ b/sites/all/modules/drupalorg/features/drupalorg_user/drupalorg_user.info
@@ -8,8 +8,9 @@ project = drupalorg_user
 dependencies[] = features
 dependencies[] = geolocation
 dependencies[] = geolocation_html5
-datestamp = 1351817111
+datestamp = 1392764829
 features[features_api][] = api:1
+features[field][] = user-user-field_current_company_org
 features[field][] = user-user-field_user_geolocation
 
 ; Information added by Drupal.org packaging script on 2014-02-18