Merge branch 'documentation' into apt-dht