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