drupal core update
Merge pull request #95 from dannymeldrum/master

drupal core update