Merge "Corrects various javadoc problems"