Addressed some trivial Xcode 5 compiler warnings
Avoid infinite recovery loop with unrecoverable system errors
Merge remote-tracking branch 'official/master'