I2P Address: [http://git.idk.i2p]

Merge branch 'master' into 'EXPERIMENTAL-debian'

# Conflicts:
#   Makefile
7 jobs for EXPERIMENTAL-debian in 0 seconds (queued for 77 minutes and 52 seconds)
latest Auto DevOps