[FIX] XQuery, xquery:eval: timeout handling. Fixes #895
[MOD] Merged with master