Update Model/Behaviors callback signature to be PHP5.4+ compliant.
Merge pull request #1610 from bar/php54-callback-signatures

Update Model/Behaviors callback signature to be PHP5.4+ compliant.

This may require updates to userland behaviours.