Bringing mac branch up to date (attempting)