Merge branch 'master' of github.com:saga-project/synapse