3.2.2

Ekkart Kleinod

@ekleinod

bce1cebf · Merge branch 'master' into release/3.2 · Jun 17, 2020

Merge changes script (pyMergeChanges): Correctly handle multiple different macros in the same line