Fixing compile error in Xcode 6.1
Merging