Merge proposals dependent on lp:~boegholm/pyuppaal/780495-fix

lp:~boegholm/pyuppaal/780495-fix has no merge proposals.