Use before_inclusion hooks to register plugins.
Merge pull request #2513 from CJBrew/2-1-stable

Use before_inclusion hooks to register plugins.