Merge pull request #327 from gavincornwell/1.4-dev

Mac target updates