diff --git a/drupalorg/drupalorg.module b/drupalorg/drupalorg.module
index 94efe8f..76cd47d 100755
--- a/drupalorg/drupalorg.module
+++ b/drupalorg/drupalorg.module
@@ -4148,9 +4148,15 @@ function drupalorg_menu_local_tasks_alter(&$data, $router_item, $root_path) {
       break;
   }
 
-  // Hide the View link on node pages in guides.
+  // Hide the View link on node pages in guides, and all tabs for imported
+  // AsciiDoc nodes.
   if (isset($data['tabs'][0]['output'][0]['#link']['path']) && $data['tabs'][0]['output'][0]['#link']['path'] === 'node/%/view' && ($context = og_context()) && ($group = node_load($context['gid'])) && $group->type === 'guide') {
     unset($data['tabs'][0]['output'][0]);
+    // Check to see if it is an AsciiDoc imported node.
+    $node = $router_item['page_arguments'][0];
+    if (!empty($node->field_asciidoc_source_file)) {
+      $data['tabs'] = array();
+    }
   }
 }
 
diff --git a/features/drupalorg_documentation/drupalorg_documentation.features.field_base.inc b/features/drupalorg_documentation/drupalorg_documentation.features.field_base.inc
index ccb3dfe..f6252b0 100644
--- a/features/drupalorg_documentation/drupalorg_documentation.features.field_base.inc
+++ b/features/drupalorg_documentation/drupalorg_documentation.features.field_base.inc
@@ -10,6 +10,27 @@
 function drupalorg_documentation_field_default_field_bases() {
   $field_bases = array();
 
+  // Exported field_base: 'field_asciidoc_source_file'.
+  $field_bases['field_asciidoc_source_file'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_asciidoc_source_file',
+    'indexes' => array(
+      'format' => array(
+        0 => 'format',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'text',
+    'settings' => array(
+      'max_length' => 255,
+    ),
+    'translatable' => 0,
+    'type' => 'text',
+  );
+
   // Exported field_base: 'field_documentation_changes'.
   $field_bases['field_documentation_changes'] = array(
     'active' => 1,
diff --git a/features/drupalorg_documentation/drupalorg_documentation.features.field_instance.inc b/features/drupalorg_documentation/drupalorg_documentation.features.field_instance.inc
index 61bf3e4..96728f9 100644
--- a/features/drupalorg_documentation/drupalorg_documentation.features.field_instance.inc
+++ b/features/drupalorg_documentation/drupalorg_documentation.features.field_instance.inc
@@ -203,6 +203,56 @@ function drupalorg_documentation_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'node-documentation-field_asciidoc_source_file'.
+  $field_instances['node-documentation-field_asciidoc_source_file'] = array(
+    'bundle' => 'documentation',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'If you import from AsciiDoc output using Feeds, this will be set.',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 7,
+      ),
+      'issuemetadata' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'nodechanges' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_asciidoc_source_file',
+    'label' => 'AsciiDoc Source File',
+    'required' => 0,
+    'settings' => array(
+      'text_processing' => 0,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'field_extrawidgets',
+      'settings' => array(),
+      'type' => 'field_extrawidgets_hidden',
+      'weight' => 13,
+    ),
+  );
+
   // Exported field_instance: 'node-documentation-field_documentation_status'.
   $field_instances['node-documentation-field_documentation_status'] = array(
     'bundle' => 'documentation',
@@ -624,6 +674,56 @@ function drupalorg_documentation_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'node-guide-field_asciidoc_source_file'.
+  $field_instances['node-guide-field_asciidoc_source_file'] = array(
+    'bundle' => 'guide',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'If you import from AsciiDoc output using Feeds, this will be set.',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 8,
+      ),
+      'issuemetadata' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'nodechanges' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_asciidoc_source_file',
+    'label' => 'AsciiDoc Source File',
+    'required' => 0,
+    'settings' => array(
+      'text_processing' => 0,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'field_extrawidgets',
+      'settings' => array(),
+      'type' => 'field_extrawidgets_hidden',
+      'weight' => 14,
+    ),
+  );
+
   // Exported field_instance: 'node-guide-field_guide_status'.
   $field_instances['node-guide-field_guide_status'] = array(
     'bundle' => 'guide',
@@ -1045,6 +1145,7 @@ function drupalorg_documentation_field_default_field_instances() {
 
   // Translatables
   // Included for use with string extractors like potx.
+  t('AsciiDoc Source File');
   t('Body');
   t('Description');
   t('Description of the guide and its contents.');
@@ -1055,6 +1156,7 @@ function drupalorg_documentation_field_default_field_instances() {
   t('Group');
   t('Guide');
   t('Guide changes');
+  t('If you import from AsciiDoc output using Feeds, this will be set.');
   t('Related content');
   t('Related content for this documentation guide. These can be other documentation guides, pages, posts or book listings.');
   t('Related content for this documentation page. These can be other documentation pages and guides, change records, pages or posts.');
diff --git a/features/drupalorg_documentation/drupalorg_documentation.features.filter.inc b/features/drupalorg_documentation/drupalorg_documentation.features.filter.inc
new file mode 100644
index 0000000..da07ab5
--- /dev/null
+++ b/features/drupalorg_documentation/drupalorg_documentation.features.filter.inc
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @file
+ * drupalorg_documentation.features.filter.inc
+ */
+
+/**
+ * Implements hook_filter_default_formats().
+ */
+function drupalorg_documentation_filter_default_formats() {
+  $formats = array();
+
+  // Exported format: Asciidoc Import.
+  $formats['asciidoc_import'] = array(
+    'format' => 'asciidoc_import',
+    'name' => 'Asciidoc Import',
+    'cache' => 1,
+    'status' => 1,
+    'weight' => 0,
+    'filters' => array(
+      'filter_htmlcorrector' => array(
+        'weight' => 10,
+        'status' => 1,
+        'settings' => array(),
+      ),
+    ),
+  );
+
+  return $formats;
+}
diff --git a/features/drupalorg_documentation/drupalorg_documentation.features.inc b/features/drupalorg_documentation/drupalorg_documentation.features.inc
index 6b2532f..f9e75c0 100644
--- a/features/drupalorg_documentation/drupalorg_documentation.features.inc
+++ b/features/drupalorg_documentation/drupalorg_documentation.features.inc
@@ -11,6 +11,9 @@ function drupalorg_documentation_ctools_plugin_api($module = NULL, $api = NULL)
   if ($module == "ctools_custom_content" && $api == "ctools_content") {
     return array("version" => "1");
   }
+  if ($module == "feeds" && $api == "feeds_importer_default") {
+    return array("version" => "1");
+  }
   if ($module == "page_manager" && $api == "pages_default") {
     return array("version" => "1");
   }
diff --git a/features/drupalorg_documentation/drupalorg_documentation.features.user_permission.inc b/features/drupalorg_documentation/drupalorg_documentation.features.user_permission.inc
new file mode 100644
index 0000000..b9f0956
--- /dev/null
+++ b/features/drupalorg_documentation/drupalorg_documentation.features.user_permission.inc
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @file
+ * drupalorg_documentation.features.user_permission.inc
+ */
+
+/**
+ * Implements hook_user_default_permissions().
+ */
+function drupalorg_documentation_user_default_permissions() {
+  $permissions = array();
+
+  // Exported permission: 'administer asciidoc'.
+  $permissions['administer asciidoc'] = array(
+    'name' => 'administer asciidoc',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'asciidoc_display',
+  );
+
+  // Exported permission: 'administer feeds'.
+  $permissions['administer feeds'] = array(
+    'name' => 'administer feeds',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'feeds',
+  );
+
+  // Exported permission: 'clear asciidoc_user_guide feeds'.
+  $permissions['clear asciidoc_user_guide feeds'] = array(
+    'name' => 'clear asciidoc_user_guide feeds',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'feeds',
+  );
+
+  // Exported permission: 'clear asciidoc_user_guide_guidelines feeds'.
+  $permissions['clear asciidoc_user_guide_guidelines feeds'] = array(
+    'name' => 'clear asciidoc_user_guide_guidelines feeds',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'feeds',
+  );
+
+  // Exported permission: 'edit asciidoc source'.
+  $permissions['edit asciidoc source'] = array(
+    'name' => 'edit asciidoc source',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'authenticated user' => 'authenticated user',
+    ),
+    'module' => 'asciidoc_display',
+  );
+
+  // Exported permission: 'import asciidoc_user_guide feeds'.
+  $permissions['import asciidoc_user_guide feeds'] = array(
+    'name' => 'import asciidoc_user_guide feeds',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'feeds',
+  );
+
+  // Exported permission: 'import asciidoc_user_guide_guidelines feeds'.
+  $permissions['import asciidoc_user_guide_guidelines feeds'] = array(
+    'name' => 'import asciidoc_user_guide_guidelines feeds',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'feeds',
+  );
+
+  // Exported permission: 'unlock asciidoc_user_guide feeds'.
+  $permissions['unlock asciidoc_user_guide feeds'] = array(
+    'name' => 'unlock asciidoc_user_guide feeds',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'feeds',
+  );
+
+  // Exported permission: 'unlock asciidoc_user_guide_guidelines feeds'.
+  $permissions['unlock asciidoc_user_guide_guidelines feeds'] = array(
+    'name' => 'unlock asciidoc_user_guide_guidelines feeds',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'feeds',
+  );
+
+  // Exported permission: 'use text format asciidoc_import'.
+  $permissions['use text format asciidoc_import'] = array(
+    'name' => 'use text format asciidoc_import',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'filter',
+  );
+
+  return $permissions;
+}
diff --git a/features/drupalorg_documentation/drupalorg_documentation.feeds_importer_default.inc b/features/drupalorg_documentation/drupalorg_documentation.feeds_importer_default.inc
new file mode 100644
index 0000000..13d8311
--- /dev/null
+++ b/features/drupalorg_documentation/drupalorg_documentation.feeds_importer_default.inc
@@ -0,0 +1,307 @@
+<?php
+/**
+ * @file
+ * drupalorg_documentation.feeds_importer_default.inc
+ */
+
+/**
+ * Implements hook_feeds_importer_default().
+ */
+function drupalorg_documentation_feeds_importer_default() {
+  $export = array();
+
+  $feeds_importer = new stdClass();
+  $feeds_importer->disabled = FALSE; /* Edit this to true to make a default feeds_importer disabled initially */
+  $feeds_importer->api_version = 1;
+  $feeds_importer->id = 'asciidoc_user_guide';
+  $feeds_importer->config = array(
+    'name' => 'AsciiDoc User Guide',
+    'description' => 'Imports the AsciiDoc output of the User Guide into a Documentation Guide',
+    'fetcher' => array(
+      'plugin_key' => 'AsciiDocFetcher',
+      'config' => array(
+        'allowed_extensions' => 'html',
+        'direct' => TRUE,
+        'translated' => 1,
+        'source_language' => 'en',
+        'copyright_file' => 'copyright.html',
+        'source_directory' => '/usr/local/user_guide_source/source/',
+        'source_field' => 'field_asciidoc_source_file',
+        'source_message' => 'This page is generated from <a href="http://asciidoc.org/">AsciiDoc</a>source from the <a href="https://www.drupal.org/project_user_guide">User Guide</a>. To propose a change, edit the source and attach the file to a <a href="https://www.drupal.org/node/add/project_issue/user_guide">new issue in the User Guide project</a>.',
+        'delete_uploaded_file' => FALSE,
+        'directory' => 'public://feeds',
+        'allowed_schemes' => array(
+          0 => 'public',
+        ),
+      ),
+    ),
+    'parser' => array(
+      'plugin_key' => 'AsciiDocParser',
+      'config' => array(
+        'internal_link_prefix' => '/docs/user_guide/[LANG]/',
+        'internal_image_prefix' => '/files/docs/user_guide/[LANG]/',
+        'show_toc' => 0,
+        'add_copyright' => 0,
+        'remove_titles' => 1,
+        'guid_prefix' => 'asciidoc_user_guide',
+      ),
+    ),
+    'processor' => array(
+      'plugin_key' => 'FeedsNodeProcessor',
+      'config' => array(
+        'expire' => '-1',
+        'author' => '180064',
+        'authorize' => 0,
+        'mappings' => array(
+          0 => array(
+            'source' => 'guid',
+            'target' => 'guid',
+            'unique' => 1,
+            'language' => 'und',
+          ),
+          1 => array(
+            'source' => 'langcode',
+            'target' => 'language',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          2 => array(
+            'source' => 'type',
+            'target' => 'asciidoc_content_type',
+            'chapter' => 'guide',
+            'book' => 'guide',
+            'language' => 'und',
+          ),
+          3 => array(
+            'source' => 'source_guid',
+            'target' => 'asciidoc_tnid',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          4 => array(
+            'source' => 'title',
+            'target' => 'title',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          5 => array(
+            'source' => 'summary',
+            'target' => 'field_summary',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          6 => array(
+            'source' => 'output_file',
+            'target' => 'asciidoc_alias',
+            'path_prefix' => 'docs/user_guide/[LANG]/',
+          ),
+          7 => array(
+            'source' => 'body',
+            'target' => 'body',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          8 => array(
+            'source' => 'images',
+            'target' => 'asciidoc_files',
+            'directory' => 'docs/user_guide/[LANG]/images/',
+            'exists_behavior' => '1',
+            'language' => 'und',
+          ),
+          9 => array(
+            'source' => 'source_file',
+            'target' => 'field_asciidoc_source_file',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          10 => array(
+            'source' => 'title',
+            'target' => 'asciidoc_comment_settings',
+            'comment_settings' => '0',
+            'language' => 'und',
+          ),
+          11 => array(
+            'source' => 'parent_guid',
+            'target' => 'og_group_ref_documentation',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          12 => array(
+            'source' => 'title',
+            'target' => 'asciidoc_menu_title',
+            'menu_name' => '',
+            'language' => 'und',
+          ),
+          13 => array(
+            'source' => 'parent_weight',
+            'target' => 'asciidoc_menu_entry_weight',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          14 => array(
+            'source' => 'parent_guid',
+            'target' => 'asciidoc_menu_og_guid',
+            'remove_if_blank' => 1,
+            'language' => 'und',
+          ),
+        ),
+        'insert_new' => '1',
+        'update_existing' => '2',
+        'update_non_existent' => 'delete',
+        'input_format' => 'asciidoc_import',
+        'skip_hash_check' => 0,
+        'bundle' => 'documentation',
+        'language' => 'und',
+      ),
+    ),
+    'content_type' => '',
+    'update' => 0,
+    'import_period' => '-1',
+    'expire_period' => 3600,
+    'import_on_create' => 1,
+    'process_in_background' => 0,
+  );
+  $export['asciidoc_user_guide'] = $feeds_importer;
+
+  $feeds_importer = new stdClass();
+  $feeds_importer->disabled = FALSE; /* Edit this to true to make a default feeds_importer disabled initially */
+  $feeds_importer->api_version = 1;
+  $feeds_importer->id = 'asciidoc_user_guide_guidelines';
+  $feeds_importer->config = array(
+    'name' => 'AsciiDoc Contributor Guide',
+    'description' => 'Contributor guide for the User Guide project',
+    'fetcher' => array(
+      'plugin_key' => 'AsciiDocFetcher',
+      'config' => array(
+        'allowed_extensions' => 'html',
+        'direct' => TRUE,
+        'translated' => 0,
+        'source_language' => 'en',
+        'copyright_file' => 'copyright.html',
+        'source_directory' => '/usr/local/user_guide_source/guidelines',
+        'source_field' => 'field_asciidoc_source_file',
+        'source_message' => 'This page is generated from <a href="http://asciidoc.org/">AsciiDoc</a>source from the <a href="https://www.drupal.org/project_user_guide">User Guide</a>. To propose a change, edit the source and attach the file to a <a href="https://www.drupal.org/node/add/project_issue/user_guide">new issue in the User Guide project</a>.',
+        'delete_uploaded_file' => FALSE,
+        'directory' => 'public://feeds',
+        'allowed_schemes' => array(
+          0 => 'public',
+        ),
+      ),
+    ),
+    'parser' => array(
+      'plugin_key' => 'AsciiDocParser',
+      'config' => array(
+        'internal_link_prefix' => '/docs/user_guide_guidelines/',
+        'internal_image_prefix' => '/files/docs/user_guide/guidelines/',
+        'show_toc' => 0,
+        'add_copyright' => 0,
+        'remove_titles' => 1,
+        'guid_prefix' => 'asciidoc_user_guide_guidelines',
+      ),
+    ),
+    'processor' => array(
+      'plugin_key' => 'FeedsNodeProcessor',
+      'config' => array(
+        'expire' => '-1',
+        'author' => '180064',
+        'authorize' => 0,
+        'mappings' => array(
+          0 => array(
+            'source' => 'guid',
+            'target' => 'guid',
+            'unique' => 1,
+            'language' => 'und',
+          ),
+          1 => array(
+            'source' => 'type',
+            'target' => 'asciidoc_content_type',
+            'chapter' => 'guide',
+            'book' => 'guide',
+            'language' => 'und',
+          ),
+          2 => array(
+            'source' => 'title',
+            'target' => 'title',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          3 => array(
+            'source' => 'summary',
+            'target' => 'field_summary',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          4 => array(
+            'source' => 'output_file',
+            'target' => 'asciidoc_alias',
+            'path_prefix' => 'docs/user_guide_guidelines/',
+          ),
+          5 => array(
+            'source' => 'body',
+            'target' => 'body',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          6 => array(
+            'source' => 'images',
+            'target' => 'asciidoc_files',
+            'directory' => 'docs/user_guide/guidelines/images/',
+            'exists_behavior' => '1',
+          ),
+          7 => array(
+            'source' => 'source_file',
+            'target' => 'field_asciidoc_source_file',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          8 => array(
+            'source' => 'title',
+            'target' => 'asciidoc_comment_settings',
+            'comment_settings' => '0',
+            'language' => 'und',
+          ),
+          9 => array(
+            'source' => 'parent_guid',
+            'target' => 'og_group_ref_documentation',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          10 => array(
+            'source' => 'title',
+            'target' => 'asciidoc_menu_title',
+            'menu_name' => '',
+            'language' => 'und',
+          ),
+          11 => array(
+            'source' => 'parent_weight',
+            'target' => 'asciidoc_menu_entry_weight',
+            'unique' => FALSE,
+            'language' => 'und',
+          ),
+          12 => array(
+            'source' => 'parent_guid',
+            'target' => 'asciidoc_menu_og_guid',
+            'remove_if_blank' => 1,
+            'language' => 'und',
+          ),
+        ),
+        'insert_new' => '1',
+        'update_existing' => '2',
+        'update_non_existent' => 'delete',
+        'input_format' => 'asciidoc_import',
+        'skip_hash_check' => 0,
+        'bundle' => 'documentation',
+        'language' => 'en',
+      ),
+    ),
+    'content_type' => '',
+    'update' => 0,
+    'import_period' => '-1',
+    'expire_period' => 3600,
+    'import_on_create' => 1,
+    'process_in_background' => 0,
+  );
+  $export['asciidoc_user_guide_guidelines'] = $feeds_importer;
+
+  return $export;
+}
diff --git a/features/drupalorg_documentation/drupalorg_documentation.info b/features/drupalorg_documentation/drupalorg_documentation.info
index 467a81b..99b77d2 100644
--- a/features/drupalorg_documentation/drupalorg_documentation.info
+++ b/features/drupalorg_documentation/drupalorg_documentation.info
@@ -4,6 +4,8 @@ core = 7.x
 package = Features
 version = 7.x-3.x-dev
 project = drupalorg
+dependencies[] = asciidoc_display
+dependencies[] = asciidoc_display_feeds
 dependencies[] = ctools
 dependencies[] = ctools_custom_content
 dependencies[] = drupalorg_change_notice
@@ -11,8 +13,10 @@ dependencies[] = drupalorg_content_types
 dependencies[] = drupalorg_marketplace
 dependencies[] = entityreference
 dependencies[] = features
+dependencies[] = feeds
 dependencies[] = field_extrawidgets
 dependencies[] = file
+dependencies[] = filter
 dependencies[] = list
 dependencies[] = metatag
 dependencies[] = nodechanges
@@ -27,14 +31,18 @@ dependencies[] = taxonomy
 dependencies[] = text
 dependencies[] = views
 dependencies[] = views_content
-datestamp = 1471527946
+datestamp = 1464285584
 features[ctools][] = ctools_custom_content:ctools_content:1
+features[ctools][] = feeds:feeds_importer_default:1
 features[ctools][] = page_manager:pages_default:1
 features[ctools][] = panelizer:panelizer:1
 features[ctools][] = strongarm:strongarm:1
 features[ctools][] = views:views_default:3.0
 features[ctools_custom_content][] = documentation_copyright
 features[features_api][] = api:2
+features[feeds_importer][] = asciidoc_user_guide
+features[feeds_importer][] = asciidoc_user_guide_guidelines
+features[field_base][] = field_asciidoc_source_file
 features[field_base][] = field_documentation_changes
 features[field_base][] = field_documentation_status
 features[field_base][] = field_guide_changes
@@ -48,6 +56,7 @@ features[field_instance][] = comment-comment_node_documentation-field_documentat
 features[field_instance][] = comment-comment_node_guide-comment_body
 features[field_instance][] = comment-comment_node_guide-field_guide_changes
 features[field_instance][] = node-documentation-body
+features[field_instance][] = node-documentation-field_asciidoc_source_file
 features[field_instance][] = node-documentation-field_documentation_status
 features[field_instance][] = node-documentation-field_related_content
 features[field_instance][] = node-documentation-field_summary
@@ -55,6 +64,7 @@ features[field_instance][] = node-documentation-field_tags
 features[field_instance][] = node-documentation-og_group_ref_documentation
 features[field_instance][] = node-documentation-upload
 features[field_instance][] = node-guide-body
+features[field_instance][] = node-guide-field_asciidoc_source_file
 features[field_instance][] = node-guide-field_guide_status
 features[field_instance][] = node-guide-field_related_content
 features[field_instance][] = node-guide-field_summary
@@ -62,6 +72,7 @@ features[field_instance][] = node-guide-field_tags
 features[field_instance][] = node-guide-group_group
 features[field_instance][] = node-guide-og_group_ref_documentation
 features[field_instance][] = node-guide-upload
+features[filter][] = asciidoc_import
 features[metatag][] = node:documentation
 features[metatag][] = node:guide
 features[node][] = documentation
@@ -141,6 +152,16 @@ features[page_manager_pages][] = discuss
 features[panelizer_defaults][] = node:documentation:default:default
 features[panelizer_defaults][] = node:guide:default:default
 features[taxonomy][] = tags
+features[user_permission][] = administer asciidoc
+features[user_permission][] = administer feeds
+features[user_permission][] = clear asciidoc_user_guide feeds
+features[user_permission][] = clear asciidoc_user_guide_guidelines feeds
+features[user_permission][] = edit asciidoc source
+features[user_permission][] = import asciidoc_user_guide feeds
+features[user_permission][] = import asciidoc_user_guide_guidelines feeds
+features[user_permission][] = unlock asciidoc_user_guide feeds
+features[user_permission][] = unlock asciidoc_user_guide_guidelines feeds
+features[user_permission][] = use text format asciidoc_import
 features[variable][] = comment_anonymous_documentation
 features[variable][] = comment_anonymous_guide
 features[variable][] = comment_default_mode_documentation
diff --git a/features/drupalorg_documentation/drupalorg_documentation.pages_default.inc b/features/drupalorg_documentation/drupalorg_documentation.pages_default.inc
index da4d6f4..c1a0e78 100644
--- a/features/drupalorg_documentation/drupalorg_documentation.pages_default.inc
+++ b/features/drupalorg_documentation/drupalorg_documentation.pages_default.inc
@@ -117,8 +117,6 @@ function drupalorg_documentation_default_page_manager_pages() {
   $display->cache = array();
   $display->title = 'Discuss <em>%node:title</em>';
   $display->uuid = 'ef07149a-91a0-4ac7-bd29-ac42cfccdfa2';
-  $display->storage_type = '';
-  $display->storage_id = '';
   $display->content = array();
   $display->panels = array();
   $pane = new stdClass();
diff --git a/features/drupalorg_documentation/drupalorg_documentation.panelizer.inc b/features/drupalorg_documentation/drupalorg_documentation.panelizer.inc
index b519a84..81b22a7 100644
--- a/features/drupalorg_documentation/drupalorg_documentation.panelizer.inc
+++ b/features/drupalorg_documentation/drupalorg_documentation.panelizer.inc
@@ -45,8 +45,6 @@ function drupalorg_documentation_panelizer_defaults() {
   $display->cache = array();
   $display->title = '%node:title';
   $display->uuid = 'ad8d5074-536d-44bb-afbc-e81782f60fdd';
-  $display->storage_type = '';
-  $display->storage_id = '';
   $display->content = array();
   $display->panels = array();
   $pane = new stdClass();
@@ -88,7 +86,9 @@ function drupalorg_documentation_panelizer_defaults() {
     'substitute' => TRUE,
   );
   $pane->cache = array();
-  $pane->style = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
   $pane->css = array();
   $pane->extras = array();
   $pane->position = 0;
@@ -114,7 +114,9 @@ function drupalorg_documentation_panelizer_defaults() {
     'override_title_heading' => 'h2',
   );
   $pane->cache = array();
-  $pane->style = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
   $pane->css = array();
   $pane->extras = array();
   $pane->position = 0;
@@ -137,7 +139,9 @@ function drupalorg_documentation_panelizer_defaults() {
     'override_title_heading' => 'h2',
   );
   $pane->cache = array();
-  $pane->style = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
   $pane->css = array();
   $pane->extras = array();
   $pane->position = 1;
@@ -160,7 +164,9 @@ function drupalorg_documentation_panelizer_defaults() {
     'override_title_heading' => 'span',
   );
   $pane->cache = array();
-  $pane->style = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
   $pane->css = array();
   $pane->extras = array();
   $pane->position = 2;
@@ -188,7 +194,9 @@ function drupalorg_documentation_panelizer_defaults() {
     'override_title_heading' => 'h2',
   );
   $pane->cache = array();
-  $pane->style = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
   $pane->css = array();
   $pane->extras = array();
   $pane->position = 3;
@@ -238,7 +246,9 @@ function drupalorg_documentation_panelizer_defaults() {
     'override_title_heading' => 'h2',
   );
   $pane->cache = array();
-  $pane->style = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
   $pane->css = array();
   $pane->extras = array();
   $pane->position = 5;
@@ -259,7 +269,9 @@ function drupalorg_documentation_panelizer_defaults() {
     'override_title_heading' => 'h2',
   );
   $pane->cache = array();
-  $pane->style = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
   $pane->css = array();
   $pane->extras = array();
   $pane->position = 0;
@@ -267,6 +279,29 @@ function drupalorg_documentation_panelizer_defaults() {
   $pane->uuid = '30529426-7058-4214-a44a-82fde63c7806';
   $display->content['new-30529426-7058-4214-a44a-82fde63c7806'] = $pane;
   $display->panels['top_right_content'][0] = 'new-30529426-7058-4214-a44a-82fde63c7806';
+  $pane = new stdClass();
+  $pane->pid = 'new-caacb2f4-f248-4728-be49-8de5d92944b8';
+  $pane->panel = 'top_right_content';
+  $pane->type = 'block';
+  $pane->subtype = 'asciidoc_display_feeds-page_edit';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'override_title' => 0,
+    'override_title_text' => '',
+    'override_title_heading' => 'h2',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 1;
+  $pane->locks = array();
+  $pane->uuid = 'caacb2f4-f248-4728-be49-8de5d92944b8';
+  $display->content['new-caacb2f4-f248-4728-be49-8de5d92944b8'] = $pane;
+  $display->panels['top_right_content'][1] = 'new-caacb2f4-f248-4728-be49-8de5d92944b8';
   $display->hide_title = PANELS_TITLE_NONE;
   $display->title_pane = '0';
   $panelizer->display = $display;
@@ -307,8 +342,6 @@ function drupalorg_documentation_panelizer_defaults() {
   $display->cache = array();
   $display->title = '%node:title';
   $display->uuid = 'f62ff545-cdd2-4ecd-8646-d016cdb5f879';
-  $display->storage_type = '';
-  $display->storage_id = '';
   $display->content = array();
   $display->panels = array();
   $pane = new stdClass();
@@ -395,7 +428,9 @@ function drupalorg_documentation_panelizer_defaults() {
     'override_title_heading' => 'h2',
   );
   $pane->cache = array();
-  $pane->style = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
   $pane->css = array();
   $pane->extras = array();
   $pane->position = 3;
@@ -575,6 +610,29 @@ function drupalorg_documentation_panelizer_defaults() {
   $pane->uuid = 'c51c42f6-5f91-44e6-a324-9f0838a464bc';
   $display->content['new-c51c42f6-5f91-44e6-a324-9f0838a464bc'] = $pane;
   $display->panels['top_right_content'][0] = 'new-c51c42f6-5f91-44e6-a324-9f0838a464bc';
+  $pane = new stdClass();
+  $pane->pid = 'new-5a7d8088-5d0d-4334-b7a3-1f68652f6f12';
+  $pane->panel = 'top_right_content';
+  $pane->type = 'block';
+  $pane->subtype = 'asciidoc_display_feeds-page_edit';
+  $pane->shown = TRUE;
+  $pane->access = array();
+  $pane->configuration = array(
+    'override_title' => 0,
+    'override_title_text' => '',
+    'override_title_heading' => 'h2',
+  );
+  $pane->cache = array();
+  $pane->style = array(
+    'settings' => NULL,
+  );
+  $pane->css = array();
+  $pane->extras = array();
+  $pane->position = 1;
+  $pane->locks = array();
+  $pane->uuid = '5a7d8088-5d0d-4334-b7a3-1f68652f6f12';
+  $display->content['new-5a7d8088-5d0d-4334-b7a3-1f68652f6f12'] = $pane;
+  $display->panels['top_right_content'][1] = 'new-5a7d8088-5d0d-4334-b7a3-1f68652f6f12';
   $display->hide_title = PANELS_TITLE_NONE;
   $display->title_pane = '0';
   $panelizer->display = $display;
diff --git a/features/drupalorg_documentation/drupalorg_documentation.strongarm.inc b/features/drupalorg_documentation/drupalorg_documentation.strongarm.inc
index bd54874..726a7c6 100644
--- a/features/drupalorg_documentation/drupalorg_documentation.strongarm.inc
+++ b/features/drupalorg_documentation/drupalorg_documentation.strongarm.inc
@@ -249,14 +249,14 @@ function drupalorg_documentation_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'language_content_type_documentation';
-  $strongarm->value = '0';
+  $strongarm->value = '2';
   $export['language_content_type_documentation'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'language_content_type_guide';
-  $strongarm->value = '0';
+  $strongarm->value = '2';
   $export['language_content_type_guide'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -308,7 +308,6 @@ function drupalorg_documentation_strongarm() {
   $strongarm->value = array(
     0 => 'status',
     1 => 'revision',
-    2 => 'panelizer',
   );
   $export['node_options_documentation'] = $strongarm;
 
@@ -319,7 +318,6 @@ function drupalorg_documentation_strongarm() {
   $strongarm->value = array(
     0 => 'status',
     1 => 'revision',
-    2 => 'panelizer',
   );
   $export['node_options_guide'] = $strongarm;
 
diff --git a/features/drupalorg_documentation/drupalorg_documentation.views_default.inc b/features/drupalorg_documentation/drupalorg_documentation.views_default.inc
index 0731957..edae83d 100644
--- a/features/drupalorg_documentation/drupalorg_documentation.views_default.inc
+++ b/features/drupalorg_documentation/drupalorg_documentation.views_default.inc
@@ -69,6 +69,14 @@ function drupalorg_documentation_views_default_views() {
   $handler->display->display_options['filters']['status']['value'] = '1';
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+  /* Filter criterion: User: Name */
+  $handler->display->display_options['filters']['uid']['id'] = 'uid';
+  $handler->display->display_options['filters']['uid']['table'] = 'users';
+  $handler->display->display_options['filters']['uid']['field'] = 'uid';
+  $handler->display->display_options['filters']['uid']['operator'] = 'not in';
+  $handler->display->display_options['filters']['uid']['value'] = array(
+    0 => '180064',
+  );
 
   /* Display: Content pane */
   $handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1');