[FIX] XQuery, Unit Module. Closes #974.
[MIN] Merged with stable branch