Merge branch 'es/osx-header-pollutes-mask-macro' into next