Merging 5.0 changes into the master, preparing for Xcode 6.0