Merge remote-tracking branch 'allegro_ralph/synergy' into synergy-scrooge