merge https://drupal.org/node/1677676