diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 65eada49e32b8fb67489a79a4739d92cb702ae09..647c98fa604726a613293fbdd0e106ee684c4d30 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,8 @@
+WCM Base 7.x-1.10-rc2, 2019-01-02
+---------------------------------
+- WCM Base: Added SMTP module patch for webform email attachments.
+- WCM Omega: Added new Panelizer layout 8c.
+
WCM Base 7.x-1.10-rc1, 2018-12-12
---------------------------------
- WCM Base:
diff --git a/profiles/wcm_base/modules/contrib/smtp/PATCHES.txt b/profiles/wcm_base/modules/contrib/smtp/PATCHES.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0a6e5579f075e3dd208653c63d1b08cfbccac1c3
--- /dev/null
+++ b/profiles/wcm_base/modules/contrib/smtp/PATCHES.txt
@@ -0,0 +1,4 @@
+The following patches have been applied to this project:
+- https://www.drupal.org/files/issues/2018-11-13/smtp-filepath_uri-2966816-27-D7_0.patch
+
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/profiles/wcm_base/modules/contrib/smtp/smtp.mail.inc b/profiles/wcm_base/modules/contrib/smtp/smtp.mail.inc
index 4887ddc192b8c65913801e67c5c1be420de9d116..69617f6fce0e0c23407406c8bf61f9c82b7923b3 100644
--- a/profiles/wcm_base/modules/contrib/smtp/smtp.mail.inc
+++ b/profiles/wcm_base/modules/contrib/smtp/smtp.mail.inc
@@ -486,6 +486,9 @@ class SmtpMailSystem implements MailSystemInterface {
if (isset($attachment['filecontent'])) {
$mailer->AddStringAttachment($attachment['filecontent'], $attachment['filename'], 'base64', $attachment['filemime']);
}
+ if (!isset($attachment['filepath']) && isset($attachment['uri'])) {
+ $attachment['filepath'] = $attachment['uri'];
+ }
if (isset($attachment['filepath'])) {
$filename = isset($attachment['filename']) ? $attachment['filename'] : basename($attachment['filepath']);
$filemime = isset($attachment['filemime']) ? $attachment['filemime'] : file_get_mimetype($attachment['filepath']);
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10a/wcm-omega-10a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10a/wcm-omega-10a.png
index e35367e2ec69238c8936f2ea43c0edd864d98f98..ee2ac3d87053a32a27782bc1c9ac67caf02f7758 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10a/wcm-omega-10a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10a/wcm-omega-10a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10b/wcm-omega-10b.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10b/wcm-omega-10b.png
index 9da465b7fa88f3a4395c1cde6b1aa3950f756f57..e0f0ca2239cfea829ae0ffb1256a0d859e370a68 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10b/wcm-omega-10b.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10b/wcm-omega-10b.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10c/wcm-omega-10c.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10c/wcm-omega-10c.png
index dad6a8a40bc41ad2d89c38c45bb910e7df4f60bb..1d64b39890b58881a28d3be640f78798822de001 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10c/wcm-omega-10c.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-10c/wcm-omega-10c.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-1a/wcm-omega-1a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-1a/wcm-omega-1a.png
index e7602385373dcdd8b8a42d4b1f60d290d97807b6..8ca1132f8dc43da6e09334806ddb8b8f6e3194c0 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-1a/wcm-omega-1a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-1a/wcm-omega-1a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-1b/wcm-omega-1b.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-1b/wcm-omega-1b.png
index f650b6810528472b87378651ce47acf8d14b1db6..775780010d0629eea5ef979033066c64003f4638 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-1b/wcm-omega-1b.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-1b/wcm-omega-1b.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-2a/wcm-omega-2a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-2a/wcm-omega-2a.png
index 0e9bc750bf521deb1bae5c8c8cd4ef74cfc30409..0e1143ca348de8d635863b6f5cd3d8abb66dcea2 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-2a/wcm-omega-2a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-2a/wcm-omega-2a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-2b/wcm-omega-2b.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-2b/wcm-omega-2b.png
index d10f514e67a3aad75dc27c9a08c43b417f7a57b3..2b84625aaabcd14d603ac7193815194097b4ca8e 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-2b/wcm-omega-2b.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-2b/wcm-omega-2b.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3a/wcm-omega-3a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3a/wcm-omega-3a.png
index 7edf3a248215ea9721ec18711a0683ddd3df8234..0e2df6bcc0cfadac9e58627a6fb6fc6fc1aaecf4 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3a/wcm-omega-3a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3a/wcm-omega-3a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3b/wcm-omega-3b.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3b/wcm-omega-3b.png
index 5cbd1a97ae66b5f5a8f0e5dcc85b967c698451e2..456609773738f3df414569adba1e76511f031d52 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3b/wcm-omega-3b.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3b/wcm-omega-3b.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3c/wcm-omega-3c.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3c/wcm-omega-3c.png
index 95b7cb81f9aa4637e1b710b0c91c4c40bb14bb01..5032d38608a08640db79e2602654a8b1180d1014 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3c/wcm-omega-3c.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3c/wcm-omega-3c.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3d/wcm-omega-3d.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3d/wcm-omega-3d.png
index a2936f59261c4e7cccc8ad25f26d640869dfe4ed..d18db71eb276995dbeaaa8cb31cf176d42236f2a 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3d/wcm-omega-3d.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3d/wcm-omega-3d.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3e/wcm-omega-3e.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3e/wcm-omega-3e.png
index ff566e88f2d1b56a2a7b180a9d0bfdc9e3e9a307..0b4f6dba708a6d7b38684664e4bf3a97f8d57874 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3e/wcm-omega-3e.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3e/wcm-omega-3e.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3f/wcm-omega-3f.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3f/wcm-omega-3f.png
index f9667d8534211f22b6bea76be36c8a0b70d006be..a499a82399c32f320d284c3203c1faf731d8f845 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3f/wcm-omega-3f.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3f/wcm-omega-3f.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4a/wcm-omega-4a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4a/wcm-omega-4a.png
index 666b35274c9e60d9acae9c3ea110d8ad34387dfb..d27f64786ffec8096e66e5cf08c946b21c9fe82e 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4a/wcm-omega-4a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4a/wcm-omega-4a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4b/wcm-omega-4b.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4b/wcm-omega-4b.png
index 1dbf7109b44befe8a64bd63102b69e16d83c967b..94c02419c49386333ab2c7613a7c9065bc7ac7c3 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4b/wcm-omega-4b.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4b/wcm-omega-4b.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4c/wcm-omega-4c.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4c/wcm-omega-4c.png
index 75dcc75eeca60d5fd21b409d93fe4c591ba602ae..1ef0eb271ad1f6f25462665042c62a11c97e9943 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4c/wcm-omega-4c.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4c/wcm-omega-4c.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4d/wcm-omega-4d.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4d/wcm-omega-4d.png
index 3df1f94e25b84e81057a4b395100b0743f4b5bea..830c7c77b06068c27cfc128e8774ba090487f7d4 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4d/wcm-omega-4d.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4d/wcm-omega-4d.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4e/wcm-omega-4e.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4e/wcm-omega-4e.png
index 628c38a0da8acb8e440526badde9656e5fe08938..f787b4cb634519a819ec28ec710936b80b7a9d36 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4e/wcm-omega-4e.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-4e/wcm-omega-4e.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-5a/wcm-omega-5a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-5a/wcm-omega-5a.png
index 7de86298021adcca422c9974d962442f60e4ddae..bd97e4f9f97c05114c7667f194968feaf1ef4cc6 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-5a/wcm-omega-5a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-5a/wcm-omega-5a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6a/wcm-omega-6a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6a/wcm-omega-6a.png
index 0ea3264607bd980b74289961fcff5210c4009473..00e8bfe5402ee90c4abd6657e4c97ba231ed1865 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6a/wcm-omega-6a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6a/wcm-omega-6a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6b/wcm-omega-6b.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6b/wcm-omega-6b.png
index 0eff9995d0ee69cf96300e2108936569161b0156..71e73a311e2659abab09a03afb20149e39ba5192 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6b/wcm-omega-6b.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6b/wcm-omega-6b.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6c/wcm-omega-6c.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6c/wcm-omega-6c.png
index 2524aca8dfd26169ed0ec98962b173f3d3237717..5653a4247c72bb0fcc96ccc39e3d9afd69277a13 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6c/wcm-omega-6c.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-6c/wcm-omega-6c.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-7a/wcm-omega-7a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-7a/wcm-omega-7a.png
index 40590a2c9d8eba9b6444554380be85662ce7b29d..b691050cc20d76e159dcaa8a30864e82c0e3357c 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-7a/wcm-omega-7a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-7a/wcm-omega-7a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8a/wcm-omega-8a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8a/wcm-omega-8a.png
index 6ca6720c52f476d2d8ca30276ad5c9be6efe2e7f..3b5b512c91a15cffc0cb8ffff49e344742f956ef 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8a/wcm-omega-8a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8a/wcm-omega-8a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8b/wcm-omega-8b.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8b/wcm-omega-8b.png
index 4a0f94a22245bc222199b7f05125802f3ec14d29..5e318455df9f9e57a1bbec3b6ee65a27fb242de5 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8b/wcm-omega-8b.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8b/wcm-omega-8b.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8c/wcm-omega-8c.inc b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8c/wcm-omega-8c.inc
new file mode 100644
index 0000000000000000000000000000000000000000..21e6b6eb5fedf159cdac14135219ccfbec4a6d70
--- /dev/null
+++ b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8c/wcm-omega-8c.inc
@@ -0,0 +1,42 @@
+<?php
+// Plugin definition
+$plugin = array(
+ 'title' => t('Layout 8c'),
+ 'icon' => 'wcm-omega-8c.png',
+ 'category' => t('WCM Omega Layouts'),
+ 'theme' => 'wcm_omega_8c',
+ 'css' => '../wcm-omega-layouts.css',
+ 'regions' => array(
+ 'tile0' => t('Tile 0'),
+ 'tile1' => t('Tile 1'),
+ 'tile2' => t('Tile 2'),
+ 'tile3' => t('Tile 3'),
+ 'tiles_header_1' => t('Tiles Header'),
+ 'tile4' => t('Tile 4'),
+ 'tile5' => t('Tile 5'),
+ 'tile6' => t('Tile 6'),
+ 'tile7' => t('Tile 7'),
+ 'tile8' => t('Tile 8'),
+ 'tile9' => t('Tile 9'),
+ 'row_1_col_1' =>t('Row 1, Column 1'),
+ 'tile10' => t('Tile 10'),
+ 'tile11' => t('Tile 11'),
+ 'tile12' => t('Tile 12'),
+ 'footer' => t('Footer'),
+ ),
+);
+
+/**
+ * Implements hook_preprocess_wcm_omega_8c().
+ */
+function template_preprocess_wcm_omega_8c(&$vars) {
+ $rows = array(
+ 'tiles_group_1' =>array('tile0','tile1', 'tile2', 'tile3', 'tiles_header_1','tile4', 'tile5', 'tile6', 'tile7', 'tile8','tile9'),
+ 'columns_group' => array('row_1_col_1'),
+ 'tiles_group_2' =>array('tile10', 'tile11', 'tile12'),
+ 'footer' => array('footer'),
+ );
+
+ $vars['panels_row'] = ocio_omega_settings_panel_rows($rows, $vars);
+ $vars['panels_row_classes'] = ocio_omega_settings_panel_row_classes();
+}
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8c/wcm-omega-8c.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8c/wcm-omega-8c.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcf9d6b7001db9a0edebb2d9d4bdc08b1e9dd188
Binary files /dev/null and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8c/wcm-omega-8c.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8c/wcm-omega-8c.tpl.php b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8c/wcm-omega-8c.tpl.php
new file mode 100644
index 0000000000000000000000000000000000000000..9c13a3a0deb7ff77eac272dc218f91861a54629d
--- /dev/null
+++ b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-8c/wcm-omega-8c.tpl.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * @file
+ * Template for custom wcm-omega-8c Panopoly layout.
+ *
+ * Variables:
+ * - $css_id: An optional CSS id to use for the layout.
+ * - $content: An array of content, each item in the array is keyed to one
+ * panel of the layout. This layout supports the following sections:
+ */
+?>
+
+<div class="panel-display wcm-omega-8c clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+ <!-- tiles_group_1 -->
+ <div class="row-tiles-group panels-row row-tiles <?php print $panels_row['tiles_group_1']; ?>">
+
+ <!-- first row of tiles -->
+ <div class="clearfix row-fluid panels-row tiles-row row-1 <?php print $panels_row_classes; ?>">
+
+ <div class="panel-panel tile-panel span2 first-tile">
+ <div class="panel-panel-inner">
+ <?php print $content['tile0']; ?>
+ </div>
+ </div>
+ <div class="panel-panel tile-panel span4">
+ <div class="panel-panel-inner">
+ <?php print $content['tile1']; ?>
+ </div>
+ </div>
+ <div class="panel-panel tile-panel span4">
+ <div class="panel-panel-inner">
+ <?php print $content['tile2']; ?>
+ </div>
+ </div>
+ <div class="panel-panel tile-panel span2 last-tile">
+ <div class="panel-panel-inner">
+ <?php print $content['tile3']; ?>
+ </div>
+ </div>
+
+ </div> <!-- /first row of tiles -->
+
+ <!-- tiles_header -->
+ <div class="clearfix row-fluid panel-panel span12 <?php print $panels_row_classes; ?>">
+ <div class="panel-panel-inner">
+ <?php print $content['tiles_header_1']; ?>
+ </div>
+ </div>
+
+ <!-- first row of tiles -->
+ <div class="clearfix row-fluid panels-row tiles-row <?php print $panels_row_classes; ?>">
+
+ <div class="panel-panel tile-panel span4 first-tile">
+ <div class="panel-panel-inner">
+ <?php print $content['tile4']; ?>
+ </div>
+ </div>
+
+ <div class="panel-panel tile-panel span4">
+ <div class="panel-panel-inner">
+ <?php print $content['tile5']; ?>
+ </div>
+ </div>
+
+ <div class="panel-panel tile-panel span4 last-tile">
+ <div class="panel-panel-inner">
+ <?php print $content['tile6']; ?>
+ </div>
+ </div>
+
+ </div><!-- /first row of tiles -->
+
+ <!-- second row of tiles -->
+ <div class="clearfix row-fluid panels-row tiles-row <?php print $panels_row_classes; ?>">
+
+ <div class="panel-panel tile-panel span4 first-tile">
+ <div class="panel-panel-inner">
+ <?php print $content['tile7']; ?>
+ </div>
+ </div>
+
+ <div class="panel-panel tile-panel span4">
+ <div class="panel-panel-inner">
+ <?php print $content['tile8']; ?>
+ </div>
+ </div>
+
+ <div class="panel-panel tile-panel span4 last-tile">
+ <div class="panel-panel-inner">
+ <?php print $content['tile9']; ?>
+ </div>
+ </div>
+
+ </div><!-- /second row of tiles -->
+
+ </div> <!-- /tiles_group_1 -->
+
+
+ <!-- columns_group -->
+ <div class="row-columns-group panels-row <?php print $panels_row['columns_group']; ?>">
+
+ <!-- first row of columns -->
+ <div class="clearfix row-fluid panels-row columns-row <?php print $panels_row_classes; ?>">
+
+ <div class="panel-panel column-panel span12">
+ <div class="panel-panel-inner">
+ <?php print $content['row_1_col_1']; ?>
+ </div>
+ </div>
+
+ </div><!-- /first row of columns -->
+
+ </div> <!-- /columns_group -->
+
+
+ <!-- tiles_group_2 -->
+ <div class="row-tiles-group panels-row row-tiles <?php print $panels_row['tiles_group_2']; ?>">
+
+ <!-- second row of tiles -->
+ <div class="clearfix row-fluid panels-row tiles-row <?php print $panels_row_classes; ?>">
+
+ <div class="panel-panel tile-panel span4 first-tile">
+ <div class="panel-panel-inner">
+ <?php print $content['tile10']; ?>
+ </div>
+ </div>
+
+ <div class="panel-panel tile-panel span4">
+ <div class="panel-panel-inner">
+ <?php print $content['tile11']; ?>
+ </div>
+ </div>
+
+ <div class="panel-panel tile-panel span4 last-tile">
+ <div class="panel-panel-inner">
+ <?php print $content['tile12']; ?>
+ </div>
+ </div>
+
+ </div><!-- /first row of tiles -->
+
+ </div> <!-- /tiles_group_2 -->
+
+ <!-- footer -->
+ <div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
+
+ <div class="clearfix row-fluid panel-panel span12 <?php print $panels_row_classes; ?>">
+ <div class="panel-panel-inner">
+ <?php print $content['footer']; ?>
+ </div>
+ </div>
+
+ </div>
+</div><!-- /.wcm-omega-8c -->
+
+
+
+
+
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-9a/wcm-omega-9a.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-9a/wcm-omega-9a.png
index 48775b05eb8bdc79dcb831d4bbe763c0a257a1e6..d29b4adeb5875ff20ede8889f40d74cedbe473c0 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-9a/wcm-omega-9a.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-9a/wcm-omega-9a.png differ
diff --git a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-9b/wcm-omega-9b.png b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-9b/wcm-omega-9b.png
index 6d2c6eb26a32c73e59c52d3e5a1d7bbc921b92cc..fc26f71b288c67fd5f3cb9e627db4be377eeb2c4 100644
Binary files a/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-9b/wcm-omega-9b.png and b/profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-9b/wcm-omega-9b.png differ
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index c5ff43e72039ad658368fbd62af800a3002e62f0..418b397475c4c576197016959f18554a1290c9e8 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -156,6 +156,7 @@ projects[smart_trim][subdir] = contrib
projects[smtp][version] = 1.7
projects[smtp][subdir] = contrib
+projects[smtp][patch][2966816] = https://www.drupal.org/files/issues/2018-11-13/smtp-filepath_uri-2966816-27-D7_0.patch
projects[special_menu_items][version] = 2.0
projects[special_menu_items][subdir] = contrib