[FIX] XQuery, TrieNode: assertion removed. Closing #634
[FIX] XQuery, File Module: also add directories that match glob syntax
Merge remote-tracking branch 'upstream/master'