Merge pull request #6744 from nupplaphil/task/namespace_to_class