Logged In: YES 
user_id=1491427

This patch is continued in patch #1462498.

Regarding the differences between patch #1462498 and this patch:
  - use self.entitydefs to determine the set of entity names
that are supported;
  - unknown entities references are left alone;
  - the regular expression entityref is used to find references;
  - a documentation patch is not needed as the method is
Internal.

Ray