Merge branch 'smaneth-devel' of ssh://git.nguyen.vg/SXSI/xpathcomp into smaneth-devel