- merge compile error fix
- Xcode has changed warnings and thus "treat errors as warnings" will cause compile errors. Since this is a 3rd party library we will let them fix the warnings on master and then pull them in later