Small cleanup to test Git + Xcode.
Merge remote-tracking branch 'origin' into feature_MPI