Updated OS X branch.