Merge branch 'feature/fix-ambiguity' into 'master'

Martin Nolterequested to merge
cherry-pick-ea003fd5 into releases/2.6

fix ambiguity of _1 for certain compilers

See merge request !128 (merged)

(cherry picked from commit ea003fd5)

848a69e2 fix ambiguity of _1 for certain compilers

Merge request reports