Merge warning fixes from Trunk. Merge Documentation fixes from Trunk. Merge updated makefiles from Trunk.