version 3.12
Merge remote-tracking branch 'origin/master'
version 2.13 uses the new proxy I've set up on dystroy.org/8000