allow functions in data
Merge branch 'master' into toto