Provide context for evaluated functions
Merge pull request #2164 from colemanw/evaluateFix

Provide context for evaluated functions