Update signals2 from master.