Rename upload variables to fix IE issue
Merge branch 'master' into gnsynthplus