Namespace fixes for June 2013 compiler
Merged