Merged (accepting all new changes) with local copy
Merged and kept my old version of getRelations. I believe the one on gDoc was out of date, and i saw no commented out changes.