tree ec0a795a2a1ef3e948bcc6d348d87689dc0a01ad
parent 5bed16c3b8501d6155504833d55b9c69417c7222
parent 0dc6470466b785fba80e727521bfbe30f025a822
author Robert Walsh <rjwalsh1985@gmail.com> 1474046964 -0500
committer Robert Walsh <rjwalsh1985@gmail.com> 1474046964 -0500

Merge remote-tracking branch 'upstream/master' into swift_3.0

# Conflicts:
#	UsergridSDK.xcodeproj/project.pbxproj