Renrhaf

diff --git a/modules/custom/arte_apios_player/arte_apios_player.module b/modules/custom/arte_apios_player/arte_apios_player.module
index ecbe3e6..d4e790a 100755
--- a/modules/custom/arte_apios_player/arte_apios_player.module
+++ b/modules/custom/arte_apios_player/arte_apios_player.module
@@ -52,6 +52,9 @@ function arte_apios_player_theme() {
         'autostart'      => 0,
         'thumbnail'      => NULL,
         'atom'           => NULL,
+        'image'          => NULL,
+        'context'        => NULL,

Renrhaf

diff --git a/foundation.make b/foundation.make
index ad7e5da..ebb1588 100755
--- a/foundation.make
+++ b/foundation.make
@@ -18,6 +18,9 @@ projects[views][subdir] = "contrib"

 projects[ctools][version] = 1.9
 projects[ctools][subdir] = "contrib"
+; Patch Ctools because of a registry bug.
+; see https://www.drupal.org/node/1775612#comment-7891155

Renrhaf

diff --git a/.travis.yml b/.travis.yml
index 68bb141..8fe4c3f 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,6 +93,7 @@ before_script:
  # Migrate processes
  - drush mreg
  - drush mi ScaldOPATest --update
+ - drush mi ScaldOPARabbitTest --update
 

Renrhaf

diff --git a/modules/features/foundation_ckeditor/foundation_ckeditor.features.ckeditor_profile.inc b/modules/features/foundation_ckeditor/foundation_ckeditor.features.ckeditor_profile.inc
index 461b83b..0fc242c 100644
--- a/modules/features/foundation_ckeditor/foundation_ckeditor.features.ckeditor_profile.inc
+++ b/modules/features/foundation_ckeditor/foundation_ckeditor.features.ckeditor_profile.inc
@@ -183,6 +183,7 @@ config.format_tags = \'p;h2;h3;h4;h5\';
       ),
       'input_formats' => array(
         'filtered_html' => 'Filtered HTML',
+        'full_html' => 'Full HTML',
         'wysiwyg' => 'WYSIWYG',

Renrhaf

diff --git a/modules/custom/arte_apios_player/arte_apios_player.module b/modules/custom/arte_apios_player/arte_apios_player.module
index d2e2c67..dafaa7c 100755
--- a/modules/custom/arte_apios_player/arte_apios_player.module
+++ b/modules/custom/arte_apios_player/arte_apios_player.module
@@ -294,7 +294,14 @@ function arte_apios_player_scald_render($atom, $context, $options = array()) {
     // Generate the required markup for Google rich snippets
     $snippet = arte_apios_player_google_rich_snippet_markup($atom);
 
-    return $atom->rendered->player . $snippet;
+    if ($snippet) {