Merge proposals dependent on lp:~tapaal-contributor/tapaal/undo-shared-place-transition-1848948

1. undo-shared-place-transition-1848948
2. Dependent merge proposals