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

Plugin support for core changes.