Plugin support for core changes.
Merge pull request #191 from csmith/master

Plugin support for core changes.