Merge Mac release from Ernesto