switched back to Jargon 3.2.0 temporarily to fix a problem with slow uploads
Merge branch 'dev'