Merged in JavaDoc service contribution from Jay