Fix for qnames without spaces
Merge branch 'hotfix/qname'