[SVN r80934]
Merge Documentation fixes from Trunk. Merge updated makefiles from Trunk. [SVN r78577]
[SVN r71477]
[SVN r67718]