Merge branch 'patch/xmlcomplete-iskeyword' into master-gui