Merged in the new Javadoc code from the "development" branch.