Improve consistency in handling of namespaces#750

Merged

sebastianbergmann merged 2 commits intosebastianbergmann:masterfrom dvdoug:consistency_in_namespace_handling

May 19, 2020

+208-7

Commits on May 18, 2020