Caught namespaces branch up with master before merging back.