Merge remote-tracking branch 'origin/master' into incremental

compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField.kt

@@ -0,0 +1,4 @@
+package test
+
+public class InheritJavaField(): Super() {
+}

compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField.txt

@@ -0,0 +1,15 @@
+package test
+
+public final class InheritJavaField : test.Super {
+    public constructor InheritJavaField()
+    public final override /*1*/ /*fake_override*/ var field: kotlin.Int
+    invisible_fake final override /*1*/ /*fake_override*/ var privateField: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun method(): kotlin.Int
+}
+
+public open class Super : java.lang.Object {
+    public constructor Super()
+    public final var field: kotlin.Int
+    private final var privateField: kotlin.Int
+    public open fun method(): kotlin.Int
+}

compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField/Super.java

@@ -0,0 +1,7 @@
+package test;
+
+public class Super {
+    public int field = 55;
+    private int privateField = 54;
+    public int method() { return 1; }
+}