Fixed double-entry in documentation comments.
Merge branch 'master' into framework-headers
Tweaked public/project status of various headers; they don't all need to be public.