-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api