Merge remote-tracking branch 'upstream/develop' into scade5-arrays
Merge branch 'scade6-arrays' of github.com:chsticksel/kind2 into scade6-arrays