Merge remote branch 'origin/master'

idea/tests/org/jetbrains/jet/JetTestUtils.java

@@ -178,6 +178,7 @@ public class JetTestUtils {
                 public Collection<JetDiagnostic> getDiagnostics() {
                     throw new UnsupportedOperationException(); // TODO
                 }
+
             };
         }
     };

idea/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java

@@ -277,6 +277,8 @@ public class JetTypeCheckerTest extends LightDaemonAnalyzerTestCase {
         assertSubtype("Derived_T<Int>", "Base_T<in Int>");
         assertSubtype("MDerived_T<Int>", "Base_T<in Int>");
         assertSubtype("ArrayList<Int>", "List<in Int>");
+
+        assertSubtype("Integer", "java.lang.Comparable<Integer>?");
     }
 
     public void testNullable() throws Exception {