Merge remote-tracking branch 'upstream/master' (including couplings o…

…rder madgraph5#918, and smaller patch madgraph5#939 and madgraph5#849) into susy2

Note: there is no change with respect to the previous origin/susy2 after this merge (no need to rerun the CI)