Correctly upload json fix
Fix weighting too
Merge pull request #10633 from jokermatt999/quiverfull

Quiverfull fixes
Merge branch 'master' into diaperfur