Merge "Links in Environment javadoc"