Wrapping everything in namespaces (support for namespaced aliases)
Merge remote-tracking branch 'origin/master'