Merge pull request #5 from larowlan/fix-for-2271419

Fix for http://drupal.org/node/2271419
Fix link for http://drupal.org/node/2271419
Merge branch '8.x-2.x' into fix-for-2271419