Changes to help with implementation of derivative hook.
Merge pull request #26 from adam-vessey/7.x-derivatives

Changes to help with implementation of derivative hook.