Upload button update
Merge remote-tracking branch 'origin/master'

Everything should work. Probably.