Merge "Fix building on modern versions of Xcode and OS X." into lmp-mr1-dev