patch submitted in https://drupal.org/node/2106687