Merge "fix the OS X builds until we can fix compiler warnings that apparently"