[FIX] FLWOR rewritings, #961
Merge branch 'stable'