Added patch to core (should be included in next release) from https://drupal.org/node/1824820#comment-8396811