Fix for #npcedit qglobal
Fix to changelog conflict in merge.