Merge remote branch 'origin/master'

compiler/testData/diagnostics/tests/scopes/kt900.jet

@@ -67,3 +67,29 @@ object N {
         fun bar() {}
     }
 }
+
+//FILE:c.kt
+// import all members from class object
+package c
+
+import A.*
+import M.*
+
+fun foo() {
+    val <!UNUSED_VARIABLE!>b<!>: B = B()
+    var <!UNUSED_VARIABLE!>r<!>: R = R()
+}
+
+class A() {
+    class object {
+        class B() {
+            class object {
+            }
+        }
+    }
+}
+
+object M {
+    fun foo() {}
+    class R() {}
+}