Upgrade1.3

@Gohla, can you merge this PR and delete the `upgrade1.3` branch when everything works? Then these last changes will be automatically incorporated in our open PR to the upstream `metaborg/spoofax-jasmin`.