New feature: Add entity name to dictionary (bug #712439)
pull request by Michael Wermeester