Update to support Xcode 5.1

Change-Id: I84ff6cd0afad9dcf8d68f3a6770d1bec535eeb04