Merge branch 'vlan/pyi'

diff --cc python/src/META-INF/python-core.xml
index 29489c86a6184c49a6f845828b41c2b11f6e5a64,8ee1429e194c452beb163bcf727217059c728e02..ef7f6fb1efc91681d126ce648e7d8269a0ed78c0
--- 1/python/src/META-INF/python-core.xml
--- 2/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@@ -560,9 -560,11 +560,12 @@@
  
      <!-- typing -->
      <multiHostInjector implementation="com.jetbrains.python.codeInsight.PyTypingAnnotationInjector"/>
+     <lang.parserDefinition language="PythonStub" implementationClass="com.jetbrains.python.pyi.PyiParserDefinition"/>
+     <fileTypeFactory implementation="com.jetbrains.python.pyi.PyiFileTypeFactory"/>
+     <codeInsight.lineMarkerProvider language="Python" implementationClass="com.jetbrains.python.pyi.PyiRelatedItemLineMarkerProvider"/>
  
      <lang.inspectionSuppressor language="Python" implementationClass="com.jetbrains.python.inspections.PyInspectionsSuppressor"/>
 +    <refactoring.invertBoolean implementation="com.jetbrains.python.refactoring.invertBoolean.PyInvertBooleanDelegate"/>
    </extensions>
  
    <extensionPoints>

diff --cc python/src/com/jetbrains/python/psi/PyUtil.java
Simple merge