Add patch (https://drupal.org/node/1525176#comment-7812787) for core