[X2Go-Commits] [nx-libs] 05/429: Merge branch 'uli42-pr/fix_wrap_macros' into 3.6.x