Apply a manual astyle formatting cleanup.
Apply indentation to namespaces via astyle formatting.
Merge master into formatting_cleanup.