Merge "Use the same compilation flags on OS X 10.8 as 10.7"