JSONiq grammar. Not ready yet
Merge remote-tracking branch 'origin/master'