Handle core package changes.
Merge pull request #108 from csmith/master

Handle core package changes.