Merge branch 'master' into develop
symlink for oxtradoc can't use DESTDIR in the source
fix 'vendor' and some double includes
add SLAX_VERSION and slaxLoadBuffer
add slaxLoadBuffer()
use SLAX_VERSION
add --xpath mode
add --xpath option
add --xpath option
Merge branch 'develop'