Merge pull request #1933 from jwillemsen/jwi-versionednamespacetest