Use a define for uploads
Merge branch 'staging' of github.com:cobaltcrm/cobalt into staging