Update for latest Drupal Core issues
Merge pull request #1 from rkerr/master

Update for latest Drupal Core issues