Fixed bad merge
bugfix
Merge branch 'master' into qpm