Merge pull request #60 from rhoegg/master

Support foreign key reference using field names that differ from the object type
Merge remote-tracking branch 'upstream/master'