Merge branch 'hotfix'
Add verbose name for foreign keys.
Merge branch 'verbose-name-fk' into develop