Worth a look for possible inclusion, who knows when this would hit core. Testing now. https://www.drupal.org/node/2199001#comment-10061522
