Merge branch 'master' of git+ssh://gnunet.org/gnunet