Merge 6ce99b7 i.e. "Added some package level javadoc."