Merge pull request #2108 from jgastal/master

        if len(self.from_fields) < 1 or len(self.from_fields) != len(self.to_fields):

            raise ValueError('Foreign Object from and to fields must be the same non-zero length')

        if isinstance(self.rel.to, six.string_types):

            raise ValueError('Related model %r cannot been resolved' % self.rel.to)

            raise ValueError('Related model %r cannot be resolved' % self.rel.to)

        related_fields = []

        for index in range(len(self.from_fields)):

            from_field_name = self.from_fields[index]