Updated Mac OS X branch