Include function name in database calls, debugging "unknown error"
Merge branch 'master' into builds
7.259