Fix issue with new xcode 6 beta 6

Change-Id: Ia0d316e33f9b5759e57d02fe34643184c334b456