Fix for non-inverted names.
Fix for nonstandard persNames.
Merge branch 'master' into development