clash of notations between pairing and union
Merge pull request #684 from jledent/pairing

clash of notations between pairing and union
Merge branch 'master' into errata
(marked) errata for 6f53189