Changes to allow uploader to set indexes on problems
Merge remote-tracking branch 'origin/master'