https://www.drupal.org/node/1269362#comment-7586187 Patch submitted by @chriz...