Merge pull request #2741 from dago/mac