Fix Welder not overriding Knife
Merge branch 'refs/remotes/origin/master'