Merge back from develop

Geez I don't even remember the last time their MacOS project saw any work