fixed build on Mac
Merge branch 'master' into redefinition