diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1788a80aafb..997c97a6a67 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="66babf93-591f-4747-948e-800ff98b74c8" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/IncludedModuleWrapper.java" afterPath="$PROJECT_DIR$/src/org/jruby/IncludedModuleWrapper.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/RubyModule.java" afterPath="$PROJECT_DIR$/src/org/jruby/RubyModule.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/ast/Colon2ConstNode.java" afterPath="$PROJECT_DIR$/src/org/jruby/ast/Colon2ConstNode.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/ast/Colon3Node.java" afterPath="$PROJECT_DIR$/src/org/jruby/ast/Colon3Node.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/ast/executable/RuntimeCache.java" afterPath="$PROJECT_DIR$/src/org/jruby/ast/executable/RuntimeCache.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/embed/ScriptingContainer.java" afterPath="$PROJECT_DIR$/src/org/jruby/embed/ScriptingContainer.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/embed/jsr223/Utils.java" afterPath="$PROJECT_DIR$/src/org/jruby/embed/jsr223/Utils.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/embed/variable/Constant.java" afterPath="$PROJECT_DIR$/src/org/jruby/embed/variable/Constant.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/ext/ffi/Type.java" afterPath="$PROJECT_DIR$/src/org/jruby/ext/ffi/Type.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/jruby/javasupport/util/RuntimeHelpers.java" afterPath="$PROJECT_DIR$/src/org/jruby/javasupport/util/RuntimeHelpers.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/shared.iml" afterPath="$PROJECT_DIR$/shared.iml" />
     </list>
     <ignored path="jruby.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -68,66 +60,7 @@
     <favorites_list name="jruby" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="IncludedModuleWrapper.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/jruby/IncludedModuleWrapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="268" column="5" selection-start="8623" selection-end="8623" vertical-scroll-proportion="-22.92">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="RubyModule.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/org/jruby/RubyModule.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="3421" column="58" selection-start="127270" selection-end="127270" vertical-scroll-proportion="0.46972477">
-              <folding>
-                <element signature="e#100432#100440#0" expanded="true" />
-                <element signature="e#100707#100715#0" expanded="true" />
-                <element signature="e#125356#125364#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Colon2ConstNode.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/Colon2ConstNode.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="70" column="0" selection-start="2608" selection-end="2608" vertical-scroll-proportion="-12.12">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Colon3Node.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/Colon3Node.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="139" column="0" selection-start="5052" selection-end="5052" vertical-scroll-proportion="-15.6">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="RuntimeCache.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/executable/RuntimeCache.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="432" column="0" selection-start="16948" selection-end="16948" vertical-scroll-proportion="-7.8">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="RuntimeHelpers.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/jruby/javasupport/util/RuntimeHelpers.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="2327" column="0" selection-start="101160" selection-end="101160" vertical-scroll-proportion="-6.12">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -135,9 +68,7 @@
     </FindUsagesManager>
   </component>
   <component name="Git.Settings">
-    <option name="CHECKOUT_INCLUDE_TAGS" value="false" />
-    <option name="UPDATE_CHANGES_POLICY" value="STASH" />
-    <option name="LINE_SEPARATORS_CONVERSION" value="ASK" />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
@@ -162,10 +93,9 @@
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="4" />
     <option name="y" value="22" />
-    <option name="width" value="1676" />
-    <option name="height" value="1028" />
+    <option name="width" value="1680" />
+    <option name="height" value="1024" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -193,8 +123,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -262,72 +190,25 @@
               <option name="myItemId" value="jruby" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="embed" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jruby" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jruby" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jruby" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="embed" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="internal" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jruby" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jruby" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jruby" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ast" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="project.structure.last.edited" value="Modules" />
     <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="project.structure.proportion" value="0.0" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="MemberChooser.sorted" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
+    <property name="project.structure.side.proportion" value="0.0" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.includeJavaFiles" value="false" />
     <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="GoToClass.includeJavaFiles" value="false" />
   </component>
   <component name="RunManager">
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
@@ -339,6 +220,7 @@
         <option name="BuildArtifacts" enabled="false" />
         <option name="Make" enabled="true" />
         <option name="Maven.BeforeRunTask" enabled="false" />
+        <option name="RakeTask" enabled="false" />
       </method>
     </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
@@ -351,6 +233,26 @@
         <option name="AntTarget" enabled="false" />
         <option name="BuildArtifacts" enabled="false" />
         <option name="Maven.BeforeRunTask" enabled="false" />
+        <option name="RakeTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+        <option name="RakeTask" enabled="false" />
       </method>
     </configuration>
     <configuration default="true" type="TestNG" factoryName="TestNG">
@@ -384,24 +286,7 @@
         <option name="BuildArtifacts" enabled="false" />
         <option name="Make" enabled="true" />
         <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Make" enabled="true" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
+        <option name="RakeTask" enabled="false" />
       </method>
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
@@ -422,6 +307,7 @@
         <option name="BuildArtifacts" enabled="false" />
         <option name="Make" enabled="true" />
         <option name="Maven.BeforeRunTask" enabled="false" />
+        <option name="RakeTask" enabled="false" />
       </method>
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
@@ -448,6 +334,7 @@
         <option name="BuildArtifacts" enabled="false" />
         <option name="Make" enabled="true" />
         <option name="Maven.BeforeRunTask" enabled="false" />
+        <option name="RakeTask" enabled="false" />
       </method>
     </configuration>
     <list size="0" />
@@ -459,36 +346,39 @@
   <component name="ShelveChangesManager" show_recycled="false" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
+      <changelist id="66babf93-591f-4747-948e-800ff98b74c8" name="Default" comment="" />
       <created>1324638298672</created>
       <updated>1324638298672</updated>
     </task>
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="4" y="22" width="1676" height="1028" extended-state="6" />
-    <editor active="true" />
+    <frame x="0" y="22" width="1680" height="1024" extended-state="0" />
+    <editor active="false" />
     <layout>
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32893288" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32893288" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24969324" sideWeight="0.6710671" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24938725" sideWeight="0.6710671" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32893288" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32893288" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -524,7 +414,10 @@
     <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
     <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
     <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
+    <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
+    <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
     <option name="LAST_COMMIT_MESSAGE" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
@@ -702,125 +595,175 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/jruby/embed/EmbedRubyRuntimeAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="52" column="18" selection-start="2358" selection-end="2358" vertical-scroll-proportion="-7.76">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/jruby/embed/internal/EmbedRubyRuntimeAdapterImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="132" column="43" selection-start="5308" selection-end="5308" vertical-scroll-proportion="-8.4">
-          <folding />
-        </state>
+        <state line="132" column="43" selection-start="5308" selection-end="5308" vertical-scroll-proportion="-8.4" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/maven/jruby-rake-plugin/src/main/java/org/jruby/maven/ClasspathMojo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="22" selection-start="302" selection-end="302" vertical-scroll-proportion="0.27985075">
-          <folding />
-        </state>
+        <state line="10" column="22" selection-start="302" selection-end="302" vertical-scroll-proportion="0.27985075" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/jruby/embed/ScriptingContainer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="1713" column="41" selection-start="64895" selection-end="64895" vertical-scroll-proportion="-12.44">
-          <folding />
-        </state>
+        <state line="1713" column="41" selection-start="64895" selection-end="64895" vertical-scroll-proportion="-12.44" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/jruby/embed/jsr223/Utils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="163" column="41" selection-start="6704" selection-end="6704" vertical-scroll-proportion="-10.8">
-          <folding />
-        </state>
+        <state line="163" column="41" selection-start="6704" selection-end="6704" vertical-scroll-proportion="-10.8" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/jruby/embed/variable/Constant.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="130" column="68" selection-start="5585" selection-end="5585" vertical-scroll-proportion="-7.12">
-          <folding />
-        </state>
+        <state line="130" column="68" selection-start="5585" selection-end="5585" vertical-scroll-proportion="-7.12" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/Colon2Node.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="48" column="22" selection-start="2194" selection-end="2194" vertical-scroll-proportion="0.21505377">
-          <folding />
-        </state>
+        <state line="48" column="22" selection-start="2194" selection-end="2194" vertical-scroll-proportion="0.21505377" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/ConstNode.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="47" column="13" selection-start="2090" selection-end="2090" vertical-scroll-proportion="0.10752688">
-          <folding />
-        </state>
+        <state line="47" column="13" selection-start="2090" selection-end="2090" vertical-scroll-proportion="0.10752688" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/ClassNode.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="133" column="49" selection-start="4564" selection-end="4564" vertical-scroll-proportion="0.61567163">
-          <folding />
-        </state>
+        <state line="133" column="49" selection-start="4564" selection-end="4564" vertical-scroll-proportion="0.61567163" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/jruby/ext/ffi/Type.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="75" column="76" selection-start="3402" selection-end="3402" vertical-scroll-proportion="0.33208954">
+        <state line="75" column="76" selection-start="3402" selection-end="3402" vertical-scroll-proportion="0.33208954" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/jruby/IncludedModuleWrapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="265" column="0" selection-start="8494" selection-end="8494" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jruby/IncludedModuleWrapper.java">
+    <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/Colon3Node.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="268" column="5" selection-start="8623" selection-end="8623" vertical-scroll-proportion="-22.92">
+        <state line="139" column="0" selection-start="5046" selection-end="5046" vertical-scroll-proportion="0.76744187">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/Colon2ConstNode.java">
+    <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/executable/RuntimeCache.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="70" column="0" selection-start="2608" selection-end="2608" vertical-scroll-proportion="-12.12">
+        <state line="432" column="0" selection-start="16945" selection-end="16945" vertical-scroll-proportion="0.016853932">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/Colon3Node.java">
+    <entry file="file://$PROJECT_DIR$/src/org/jruby/javasupport/util/RuntimeHelpers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="139" column="0" selection-start="5052" selection-end="5052" vertical-scroll-proportion="-15.6">
+        <state line="2327" column="0" selection-start="101196" selection-end="101196" vertical-scroll-proportion="0.016853932">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/executable/RuntimeCache.java">
+    <entry file="file://$PROJECT_DIR$/src/org/jruby/RubyModule.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="432" column="0" selection-start="16948" selection-end="16948" vertical-scroll-proportion="-7.8">
+        <state line="3440" column="16" selection-start="128993" selection-end="128993" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jruby/javasupport/util/RuntimeHelpers.java">
+    <entry file="file://$PROJECT_DIR$/src/org/jruby/ast/Colon2ConstNode.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="2327" column="0" selection-start="101160" selection-end="101160" vertical-scroll-proportion="-6.12">
+        <state line="70" column="0" selection-start="2605" selection-end="2605" vertical-scroll-proportion="0.717608">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/jruby/RubyModule.java">
+    <entry file="file://$PROJECT_DIR$/src/org/jruby/RubyGlobal.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3421" column="58" selection-start="127270" selection-end="127270" vertical-scroll-proportion="0.46972477">
-          <folding>
-            <element signature="e#100432#100440#0" expanded="true" />
-            <element signature="e#100707#100715#0" expanded="true" />
-            <element signature="e#125356#125364#0" expanded="true" />
-          </folding>
+        <state line="67" column="13" selection-start="3039" selection-end="3039" vertical-scroll-proportion="0.0">
+          <folding />
         </state>
       </provider>
     </entry>
   </component>
   <component name="masterDetails">
     <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>actionmailer (v3.2.6, RVM: jruby-1.6.7) [gem]</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.6</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>shared</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>Maven: ant:ant:1.6.2</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
       <state key="ScopeChooserConfigurable.UI">
         <settings>
           <last-edited>Java only</last-edited>
diff --git a/shared.iml b/shared.iml
index d17c5f11124..bcb8b4b9a61 100644
--- a/shared.iml
+++ b/shared.iml
@@ -13,7 +13,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build.eclipse" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library>