Update for backward compatibility
Merge pull request #1660 from cmsdoxy/patch-4

Documentation fixes -- Update for backward compatibility