diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index b40f03bf7f9e034ab015ecaf32155ab0f0d9b68e..7d858c2fe9842f477b9eb34d7c671bc5e9d53a43 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,6 +1,14 @@
+WCM Base 7.x-1.x, 2016-05-06
+----------------------------
+- WCM Base: Updated Panopoly to 1.35.
+- WCM Workbench: Link file names to file download instead of entity page.
+- OCIO Media: Added dotx as allowed file extension.
+- OCIO SimpleSAMLphp Auth: Show user password fields to SimpleSAML users if
+  global setting allows.
+
 WCM Base 7.x-1.x, 2016-05-05
 ----------------------------
-- OCIO SimpleSAMLphp auth: Disallow logging in with or resetting passwords
+- OCIO SimpleSAMLphp Auth: Disallow logging in with or resetting passwords
   for local accounts when auth type is changed to SimpleSAML.
 
 WCM Base 7.x-1.x, 2016-05-04
@@ -8,7 +16,7 @@ WCM Base 7.x-1.x, 2016-05-04
 - WCM Panels Settings: Added link field to image panels panes.
 - OCIO Omega Base:
   - Render link field on image panels panes.
-  - Update user login page to wrap local login within a collapsible div.
+  - Updated user login page to wrap local login within a collapsible div.
 - WCM Base: Updated Fieldable Panes Panes to 1.10 (security release).
 
 WCM Base 7.x-1.x, 2016-04-28
diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.features_overrides.inc b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.features_overrides.inc
index 320594f202d08e8cfd37801ad034851731e75bb8..40cfe65d4f45e1b7474931483afb7ec1d5dc31c3 100644
--- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.features_overrides.inc
+++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.features_overrides.inc
@@ -38,8 +38,9 @@ function ocio_media_features_override_default_overrides() {
   $overrides["file_type.document.disabled"] = FALSE;
   $overrides["file_type.document.mimetypes|10"] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
   $overrides["file_type.document.mimetypes|11"] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
-  $overrides["file_type.document.mimetypes|12"] = 'application/acad';
-  $overrides["file_type.document.mimetypes|13"] = 'application/dxf';
+  $overrides["file_type.document.mimetypes|12"] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template';
+  $overrides["file_type.document.mimetypes|13"] = 'application/acad';
+  $overrides["file_type.document.mimetypes|14"] = 'application/dxf';
   $overrides["file_type.document.mimetypes|4"] = 'application/zip';
   $overrides["file_type.document.mimetypes|5"] = 'application/vnd.ms-powerpoint';
   $overrides["file_type.document.mimetypes|6"] = 'application/vnd.oasis.opendocument.text';
diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.inc b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.inc
index 5e7a864fbcd20402d7f0eda3361c0eab230a466f..17cbf7c7029a2b6f4b2f350197c75d4a51de0e52 100644
--- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.inc
@@ -84,8 +84,9 @@ function ocio_media_file_default_types_alter(&$data) {
     $data['document']->disabled = FALSE; /* WAS: '' */
     $data['document']->mimetypes[10] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'; /* WAS: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' */
     $data['document']->mimetypes[11] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; /* WAS: '' */
-    $data['document']->mimetypes[12] = 'application/acad'; /* WAS: '' */
-    $data['document']->mimetypes[13] = 'application/dxf'; /* WAS: '' */
+    $data['document']->mimetypes[12] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template'; /* WAS: '' */
+    $data['document']->mimetypes[13] = 'application/acad'; /* WAS: '' */
+    $data['document']->mimetypes[14] = 'application/dxf'; /* WAS: '' */
     $data['document']->mimetypes[4] = 'application/zip'; /* WAS: 'application/vnd.ms-powerpoint' */
     $data['document']->mimetypes[5] = 'application/vnd.ms-powerpoint'; /* WAS: 'application/vnd.oasis.opendocument.text' */
     $data['document']->mimetypes[6] = 'application/vnd.oasis.opendocument.text'; /* WAS: 'application/vnd.oasis.opendocument.spreadsheet' */
diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info
index e7435d30f0d87e1b89ee9c6210c5fcc0a0eab8dd..9978753ae62dc384950f8ac48877722d3c78a45b 100644
--- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info
+++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info
@@ -74,6 +74,7 @@ features[features_overrides][] = file_type.document.mimetypes|10
 features[features_overrides][] = file_type.document.mimetypes|11
 features[features_overrides][] = file_type.document.mimetypes|12
 features[features_overrides][] = file_type.document.mimetypes|13
+features[features_overrides][] = file_type.document.mimetypes|14
 features[features_overrides][] = file_type.document.mimetypes|4
 features[features_overrides][] = file_type.document.mimetypes|5
 features[features_overrides][] = file_type.document.mimetypes|6
diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.strongarm.inc
index 426a556c5dbc3bdf1f381af3ee843a87cdb2bfaa..b70d3d8b52c7274edef9624ad1cbc1f1ab067f23 100644
--- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.strongarm.inc
@@ -334,7 +334,7 @@ function ocio_media_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'file_entity_default_allowed_extensions';
-  $strongarm->value = 'jpg jpeg gif png txt doc docx xls xlsx pdf ppt pptx pps ppsx odt ods odp zip dwg dxf';
+  $strongarm->value = 'jpg jpeg gif png txt doc docx xls xlsx pdf ppt pptx pps ppsx odt ods odp zip dwg dxf dotx';
   $export['file_entity_default_allowed_extensions'] = $strongarm;
 
   $strongarm = new stdClass();
diff --git a/profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module b/profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module
index d68df3d0cc8a23e3076a55f513f6befbc7c025ff..dd1603f21160af677b50e83577dc3759632b924d 100644
--- a/profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module
+++ b/profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module
@@ -261,8 +261,11 @@ function ocio_simplesamlphp_auth_form_user_profile_form_alter(&$form, &$form_sta
     $form['account']['name']['#description'] = 'Username can not be changed for users authenticating via SimpleSAML.';
     $form['account']['mail']['#disabled'] = TRUE;
     $form['account']['mail']['#description'] = 'Email can not be changed for users authenticating via SimpleSAML.';
-    $form['account']['pass']['#access'] = FALSE;
-    $form['account']['current_pass']['#access'] = FALSE;
+
+    // Allow saml users to set password if global setting allows
+    $password_access = variable_get('simplesamlphp_auth_allowsetdrupalpwd');
+    $form['account']['pass']['#access'] = $password_access;
+    $form['account']['current_pass']['#access'] = $password_access;
   }
 
   // add authentication method option to profile form
diff --git a/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.info b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.info
index 6024370047a40ccb7fa721af8205739a74caebdf..7ce79e0f9719ab3cbebe12937c5bf8983dbab400 100644
--- a/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.info
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.info
@@ -10,8 +10,6 @@ dependencies[] = views
 dependencies[] = workbench
 dependencies[] = workbench_media
 dependencies[] = workbench_moderation
-dependencies[] = workbench_moderation
-dependencies[] = workbench_moderation
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:2
 features[features_override_items][] = views_view.workbench_edited
diff --git a/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.views_default.inc b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.views_default.inc
index f6e8632d05a71de71d2f3fda24ce4a355ac98a22..abf2aed8e1e902b4c4bc51c3358b09e6881c17f3 100644
--- a/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.views_default.inc
+++ b/profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.views_default.inc
@@ -128,6 +128,9 @@ function wcm_workbench_views_default_views() {
   $handler->display->display_options['fields']['filename']['id'] = 'filename';
   $handler->display->display_options['fields']['filename']['table'] = 'file_managed';
   $handler->display->display_options['fields']['filename']['field'] = 'filename';
+  $handler->display->display_options['fields']['filename']['alter']['make_link'] = TRUE;
+  $handler->display->display_options['fields']['filename']['alter']['path'] = '[uri]';
+  $handler->display->display_options['fields']['filename']['link_to_file'] = FALSE;
   /* Field: File: Mime type */
   $handler->display->display_options['fields']['filemime']['id'] = 'filemime';
   $handler->display->display_options['fields']['filemime']['table'] = 'file_managed';
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
index 64743aabf302b46ae4cdcc8fc138583b8431a702..a5dc483e9ac79a2e8a23131ddc7b955259e97230 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Admin 7.x-1.35, 2016-05-04
+----------------------------
+- No changes since last release.
+
 Panopoly Admin 7.x-1.34, 2016-04-20
 ----------------------------
 - No changes since last release.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
index cb3c90b4c17debbb4f7c4e96c2162454107feca4..d7cfb7928e737db4b8d1a2e5314a79014b289ff9 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
@@ -37,9 +37,9 @@ features[page_manager_pages][] = panopoly_admin_layout_library
 features[page_manager_pages][] = panopoly_admin_page_library
 features[page_manager_pages][] = panopoly_admin_pane_library
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_admin"
-datestamp = "1461203348"
+datestamp = "1462395846"
 
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
index 9186dfa5cb9800a7f44bf159f6d006bb5f2d95f7..8750bc28aeb43260a074b47d513d53fe0d670e3a 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Core 7.x-1.35, 2016-05-04
+---------------------------
+- Update to Fieldable Panels Panes 1.10 for SA-CONTRIB-2016-025.
+
 Panopoly Core 7.x-1.34, 2016-04-20
 ---------------------------
 - Update Features to 2.10.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
index 698481e02f03e8ef5f42b35afb656bcea912a238..fefdbe5b4423e9006e906db26e5f46269fb45290 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
@@ -74,9 +74,9 @@ features[variable][] = panelizer_taxonomy_term:panopoly_categories_allowed_layou
 features[variable][] = panelizer_taxonomy_term:panopoly_categories_allowed_types_default
 features[views_view][] = panopoly_taxonomy
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_core"
-datestamp = "1461203358"
+datestamp = "1462395855"
 
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.install b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.install
index e8868d0e5961634e15e01ebbdeec1aed7559dee2..2ae3acde371c58c79f5b990f1fea2342d3ee9a25 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.install
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.install
@@ -86,6 +86,9 @@ function panopoly_core_update_dependencies() {
   $deps['module_filter'][7200] = array(
     'panopoly_core' => 7105,
   );
+  $deps['fieldable_panels_panes'][7111] = array(
+    'panopoly_core' => 7106,
+  );
   return $deps;
 }
 
@@ -233,3 +236,10 @@ function panopoly_core_update_7104() {
 function panopoly_core_update_7105() {
   registry_rebuild();
 }
+
+/**
+ * Use the new FPP revision locking mode.
+ */
+function panopoly_core_update_7106() {
+  variable_set('fpp_revision_locking', 'lock');
+}
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make
index 8db12a2916594991cabd55e1c74b9549c62497b8..817d8dc68820d03a28b96327353cbd741dbbd1d9 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make
@@ -24,7 +24,7 @@ projects[panelizer][subdir] = contrib
 projects[panelizer][patch][1623536] = http://drupal.org/files/issues/array-to-object-on-update-1623536-26.patch
 projects[panelizer][patch][2416505] = http://www.drupal.org/files/issues/panelizer-search_api-2416505-3.patch
 
-projects[fieldable_panels_panes][version] = 1.8
+projects[fieldable_panels_panes][version] = 1.10
 projects[fieldable_panels_panes][subdir] = contrib
 
 projects[pm_existing_pages][version] = 1.4
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
index 0d78b7bb47c1ad31669da6493b257035ec4ef0f5..ede9f6d88728dd683ce96d5449c40a57cc2e98ba 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Panopoly Magic 7.x-1.35, 2016-05-04
+----------------------------
+- Title in FPP is double encoded when making a link.
+- Update to Fieldable Panels Panes 1.10 for SA-CONTRIB-2016-025.
+
 Panopoly Magic 7.x-1.34, 2016-04-20
 ----------------------------
 - No changes since last release.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
index 0c4359962fdfae548cfa2005dc8214d332866c89..b479cd80b4a0670dc82cf8fc36191c05dd2f3021 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
@@ -15,9 +15,9 @@ stylesheets[all][] = css/panopoly-modal.css
 features[features_api][] = api:2
 files[] = plugins/views/panopoly_magic_plugin_display_panel_pane.inc
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_magic"
-datestamp = "1461203400"
+datestamp = "1462395884"
 
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module
index 51bc0247b1314f6667c6542eea229db719935434..0876e05e31577dfdbee11bdee43e3da564534957 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module
@@ -393,6 +393,18 @@ function panopoly_magic_form_alter(&$form, &$form_state, $form_id) {
     if ($form_id == 'fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form') {
       // Hide the revision fieldset.
       $form['revision']['#access'] = FALSE;
+      // Hide the 'Admin' fieldset.
+      $form['admin']['#access'] = FALSE;
+      // Move the 'Admin title' under reusable like in FPP 1.8 and earlier.
+      $form['reusable']['admin_title'] = $form['admin']['admin_title'];
+      $form['reusable']['admin_title']['#states'] = array(
+        'visible' => array(
+          ':input[name="reusable"]' => array('checked' => TRUE),
+        )
+      );
+      unset($form['admin']['admin_title']);
+      // Move the warning down.
+      $form['reusable']['warning']['#weight'] = 100;
 
       // Add our own submit handler ALWAYS, not just when we are generating
       // a preview.
@@ -652,7 +664,7 @@ function panopoly_magic_render_fieldable_panels_pane_preview($type, $subtype, $c
     $block->title = '';
     if (empty($settings['extra_fields']['display']) || !empty($settings['extra_fields']['display']['title']['default']['visible'])) {
       if (!empty($entity->title)) {
-        $block->title = check_plain($entity->title);
+        $block->title = filter_xss_admin($entity->title);
       }
     }
 
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
index e72d8c59f29b20a6affe17665406efc6620191c6..3d3c50a10a3eea2fb8b400ef7c6f31c2fa5d67cc 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Pages 7.x-1.35, 2016-05-04
+----------------------------
+- No changes since last release.
+
 Panopoly Pages 7.x-1.34, 2016-04-20
 ----------------------------
 - No changes since last release.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
index fb99e3c8c658e81ef778cc5f507a2fd910230c68..a6cdf02a80021183d47854d64dc5876614bc2efd 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
@@ -67,9 +67,9 @@ features[variable][] = panelizer_node:panopoly_page_allowed_layouts_default
 features[variable][] = panelizer_node:panopoly_page_allowed_types_default
 features[variable][] = save_continue_panopoly_page
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_pages"
-datestamp = "1461203413"
+datestamp = "1462395893"
 
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
index 4888e864aa753db81ba527b4a3d104172d502492..a50473586c7c228d128e2b2ab9c5b4020b5f1322 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Search 7.x-1.35, 2016-05-04
+-----------------------------
+- No changes since last release.
+
 Panopoly Search 7.x-1.34, 2016-04-20
 -----------------------------
 - Update to search_api 1.18 for SA-CONTRIB-2016-022.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
index eb6dafd15d1074091a5bfe42a1d8f92ffd584094..defbcb1586089ea2cc869892cb427a947a09642e 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
@@ -54,9 +54,9 @@ features[variable][] = search_cron_limit
 features[views_view][] = panopoly_database_search
 features[views_view][] = panopoly_search
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_search"
-datestamp = "1461203422"
+datestamp = "1462395903"
 
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
index 9d5258f6a47c99852745fbb406c8faea123b31fd..2a751aadb6a4af8d932e085e351411e11c70f158 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Test 7.x-1.35, 2016-05-04
+---------------------------
+- Title in FPP is double encoded when making a link.
+
 Panopoly Test 7.x-1.34, 2016-04-20
 ---------------------------
 - Update search_api to 1.17, search_api_db to 1.5, search_api_solr to 1.10.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
index 990e1e95219ab61ce17da92df44469c470636a87..39950f93bfd441a75f1d7725e9a387760f229f2a 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
@@ -99,9 +99,9 @@ features_exclude[dependencies][panopoly_pages] = panopoly_pages
 features_exclude[dependencies][panelizer] = panelizer
 hidden = 1
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_test"
-datestamp = "1461203642"
+datestamp = "1462395910"
 
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/panopoly_magic/livepreview.feature b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/panopoly_magic/livepreview.feature
index 602079ee749ec902c3607d6ed7979f8c30a7c697..5ed65cd2a47c75519b746ef2027a2ef61b9ffd65 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/panopoly_magic/livepreview.feature
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/panopoly_magic/livepreview.feature
@@ -432,3 +432,18 @@ Feature: Live preview
     When I press "Update Preview"
       And I wait for live preview to finish
     Then I should see "Avert your eyes! It's not even worth to cast your gaze upon this widget."
+
+  @api @javascript @panopoly_widgets
+    Scenario: Make text widget title a link
+      Given I am logged in as a user with the "administrator" role
+        And Panopoly magic live previews are automatic
+        And I am viewing a landing page
+      When I customize this page with the Panels IPE
+        And I click "Add new pane"
+        And I click "Add text" in the "CTools modal" region
+      Then I should see "Configure new Add text"
+      When I fill in the following:
+        | Title   | Here's a title & then some |
+        And I check the box "Make title a link"
+        And I wait for AJAX to finish
+      Then I should see "Here's a title & then some"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
index c267a1b43e534e20cc11666ede23d3415b41c3c5..abe25efa4dec6120df2911e4c4ad59cf21aaacea 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Theme 7.x-1.35, 2016-05-04
+----------------------------
+- No changes since last release.
+
 Panopoly Theme 7.x-1.34, 2016-04-20
 ----------------------------
 - No changes since last release.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
index 831fe3053ca1fe0d254cf1577fba695156f66b15..7ad62bff33448586e1314c063f381127ad930503 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
@@ -11,9 +11,9 @@ stylesheets[all][] = css/panopoly-accordian.css
 stylesheets[all][] = css/panopoly-layouts.css
 features[features_api][] = api:2
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_theme"
-datestamp = "1461203671"
+datestamp = "1462395919"
 
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
index 2984607b29fbb1eca5d622eb7354cabe71b8a779..4864fd3ddbcf63af54eda808c9864a78795df7df 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Widgets 7.x-1.35, 2016-05-04
+------------------------------
+- No changes since last release.
+
 Panopoly Widgets 7.x-1.34, 2016-04-20
 ------------------------------
 - No changes since last release.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
index 2044c1aff034845d59b0e4ca5008be63e1269907..9586248add380653e7eaddf269fd5f595658520d 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
@@ -119,9 +119,9 @@ features[file_display][] = video__teaser__media_youtube_image
 features[file_display][] = video__teaser__media_youtube_video
 features[views_view][] = panopoly_widgets_general_content
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_widgets"
-datestamp = "1461203696"
+datestamp = "1462395937"
 
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index e30481f336e4dbdcb166b3d5e3953bf8738cebda..9de3e87f644043345290df4891a9a5df161d0ed9 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -417,32 +417,32 @@ libraries[ocio_modernizr][download][branch] = 7.x-1.x
 
 ; The Panopoly Foundation
 
-projects[panopoly_core][version] = 1.34
+projects[panopoly_core][version] = 1.35
 projects[panopoly_core][subdir] = panopoly
 
-projects[panopoly_theme][version] = 1.34
+projects[panopoly_theme][version] = 1.35
 projects[panopoly_theme][subdir] = panopoly
 
-projects[panopoly_magic][version] = 1.34
+projects[panopoly_magic][version] = 1.35
 projects[panopoly_magic][subdir] = panopoly
 
-projects[panopoly_widgets][version] = 1.34
+projects[panopoly_widgets][version] = 1.35
 projects[panopoly_widgets][subdir] = panopoly
 
-projects[panopoly_admin][version] = 1.34
+projects[panopoly_admin][version] = 1.35
 projects[panopoly_admin][subdir] = panopoly
 
 
 ; The Panopoly Toolset
 
-projects[panopoly_pages][version] = 1.34
+projects[panopoly_pages][version] = 1.35
 projects[panopoly_pages][subdir] = panopoly
 
-projects[panopoly_search][version] = 1.34
+projects[panopoly_search][version] = 1.35
 projects[panopoly_search][subdir] = panopoly
 
 
 ; For running the automated tests.
 
-projects[panopoly_test][version] = 1.34
+projects[panopoly_test][version] = 1.35
 projects[panopoly_test][subdir] = panopoly