LMW-87 Last minute changes for Xcode 6.1 final version