Merge branch 'master' into changeSignature

Conflicts:
	plugins/groovy/testdata/highlighting/MethodDuplicates.groovy

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/InnerClassReferenceInSignature.java

@@ -0,0 +1,13 @@
+class CSS {
+  static class IO{}
+}
+
+class TD {
+  void calculateSmth(CSS.IO io){}
+}
+
+/**
+ * @see TD#calculateSmth(CSS.IO)
+ */
+class Test {
+}