Fixes related to Drupal Issue #2065101
Merge branch 'master' of github.com:shaneonabike/grics