From 7f4804f25931e8e10c03aecdab102640d904289f Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Tue, 10 Jan 2017 19:23:31 +0300
Subject: [PATCH 1/2] pycharm edu rc

---
 .../resources/idea/PyCharmEduApplicationInfo.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/educational-python/resources/idea/PyCharmEduApplicationInfo.xml b/python/educational-python/resources/idea/PyCharmEduApplicationInfo.xml
index 5306bb0b3f05..1a8a02e013cc 100644
--- a/python/educational-python/resources/idea/PyCharmEduApplicationInfo.xml
+++ b/python/educational-python/resources/idea/PyCharmEduApplicationInfo.xml
@@ -1,5 +1,5 @@
 <component>
-  <version major="3" minor="5" eap="true"/>
+  <version major="3" minor="5" eap="false"/>
   <company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
   <build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
   <logo url="/pycharm_edu_logo.png" textcolor="313131" progressColor="20d688" progressY="281" progressTailIcon="/community_progress_tail.png"/>

From 68ab7b4400328a88ee48df06ae90b500f7c06053 Mon Sep 17 00:00:00 2001
From: Andrey Dernov <Andrey.Dernov@jetbrains.com>
Date: Tue, 10 Jan 2017 19:59:31 +0300
Subject: [PATCH 2/2] Create new Swift type from usage: disable intention in
 normal mode (OC-11232, OC-11682, OC-14391)

---
 platform/util/resources/misc/registry.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index a23f76e85647..29cfec61a3f3 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -946,3 +946,4 @@ WebStorm.JavaScript.Modules.Diagram.description=Turns on module dependency diagr
 
 editable.java.test.console=true
 editable.java.test.console.description=Enables System.in in java test consoles (junit & testng)
+swift.create.type.from.usage.enabled=false