fixes: issue #395 Naming a class "Object" crashes FD
Merge pull request #538 from SlavaRa/feature/issue395_Naming_a_class_Object_crashes_FD

fixes: issue #395 Naming a class "Object" crashes FD
Merge branch 'develop' into feature/Plugins