Merge branch 'master' of gnunet.org:gnunet