Merge "Fix MacOSX 10.7 build"