Fixed a problem in the xcode project.
Merge commit '1977e8df886d39dd198c3f3b1157834c4e45b485' into develop