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