Fix handling of the namespace package.
Merge branch 'refs/heads/facets'