Cleaned up the API namespace in preparation for documentation.
Cleaned up the API namespace in preparation for documentation.
Merge origin/master
Cleaned up the API namespace in preparation for documentation.