Update name & ID for Mac OS build
Merge remote-tracking branch 'upstream/master'