Merged from Xcode 6.1