Save custom entity name in undo information
Merge branch 'master' into 1.1