Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
authorJeff Becker <jeff@i2p.rocks>
Wed, 24 Jan 2018 18:15:54 +0000 (13:15 -0500)
committerJeff Becker <jeff@i2p.rocks>
Wed, 24 Jan 2018 18:15:54 +0000 (13:15 -0500)

Trivial merge