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) {

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/.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/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/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 30266e6..1ec3c3c 100755
--- a/foundation.make
+++ b/foundation.make
@@ -373,7 +373,10 @@ projects[ldap][patch][] = "https://www.drupal.org/files/issues/ldap_servers-nest
 projects[jquery_update][version] = 3.0-alpha2
 projects[jquery_update][subdir] = "contrib"

-projects[arte_opa][version] = 1.4
+; Using a specific latest version waiting for a tagged release.

Renrhaf

diff --git a/modules/custom/arte_language/arte_language.module b/modules/custom/arte_language/arte_language.module
index 7c64efd..d610555 100755
--- a/modules/custom/arte_language/arte_language.module
+++ b/modules/custom/arte_language/arte_language.module
@@ -388,6 +388,7 @@ function _arte_language_http_request($url, array $options = array()) {
  */
 function arte_language_node_access($node, $node_op, $account) {
   global $language;
+  $langcode = $language->language;

Renrhaf

diff --git a/modules/features/scald_sitemap/README.md b/modules/features/scald_sitemap/README.md
index 8ba2b5d..5b98a94 100644
--- a/modules/features/scald_sitemap/README.md
+++ b/modules/features/scald_sitemap/README.md
@@ -1,12 +1,25 @@
-The Video Sitemaps are located at (Google and ARTE formats):
+# Scald Sitemap
 
-    http://example.com/LANGCODE/sitemaps/video.xml
-    http://example.com/LANGCODE/sitemaps/video-arte.xml

Renrhaf

diff --git a/modules/custom/arte_apios_player/css/arte-apios-player.css b/modules/custom/arte_apios_player/css/arte-apios-player.css
index 09effd0..75d629d 100644
--- a/modules/custom/arte_apios_player/css/arte-apios-player.css
+++ b/modules/custom/arte_apios_player/css/arte-apios-player.css
@@ -92,6 +92,10 @@
   z-index: 10;
 }

+.dnd-atom-wrapper.type-video {
+  display: block;

Renrhaf

diff --git a/modules/features/foundation_editorial/foundation_editorial.module b/modules/features/foundation_editorial/foundation_editorial.module
index 9cfda1f..28a3645 100644
--- a/modules/features/foundation_editorial/foundation_editorial.module
+++ b/modules/features/foundation_editorial/foundation_editorial.module
@@ -14,10 +14,12 @@ include_once 'foundation_editorial.features.inc';
 function foundation_editorial_permission() {
   return array(
     'foundation view unpublished nodes' => array(
-      'title' => t('Access unpublished content created by other users'),
+      'title' => t('View unpublished nodes'),