Support for core package changes.
Merge pull request #167 from csmith/master

Support for core package changes.