Better key handling
Fix typo
Merge pull request #948 from querydsl/i939

Better key handling