Fixes #002 (GitHub Issue) and #2109837 (Drupal Issue)

No further enhancements.