Merge branch 'origin/master'
Fixed an error preventing from using QXmlQuery and adding xmlpatterns in config files
Merge branch 'separate-ntree-from-fs'