Update qf-edit plugin
Merge branch 'master' into osx