Merge remote-tracking branch 'origin/doc/i2p' into stable