Merge pull request #2374 from totten/4.4-entitytype