Fix synergy config
Merge branch 'master' into zion