Merge "fix OpenMP detection on Mac OS broken by a6fee0b" into release-4-6