Patch: https://drupal.org/node/2237185 applied