Customized branch for xcode 5.1