Merge proposals dependent on lp:~tapaal-contributor/tapaal/fix-toggle-urgent-transition-1950689

1. fix-toggle-urgent-transition-1950689
2. Dependent merge proposals