links on upload page to help/wiki, refs #882
Merge branch 'master' into integration