update-latest-synapse #20

Open
njeudy wants to merge 2 commits from update-latest-synapse into master