Fix foreign key constrain definition
Merge branch 'master' into many-to-one