diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt
index 03aa261..7d0f9b0 100644
--- a/core/MAINTAINERS.txt
+++ b/core/MAINTAINERS.txt
@@ -304,6 +304,9 @@ Taxonomy module
 Toolbar module
 - ?
 
+Tour module
+- Nick Schuch 'nick_schuch' http://drupal.org/user/1412036
+
 Tracker module
 - David Strauss 'David Strauss' http://drupal.org/user/93254
 
diff --git a/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php b/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
index 7eed8e9..53cdfdf 100644
--- a/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
+++ b/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
@@ -13,7 +13,7 @@
 use Drupal\tour\TipsBag;
 
 /**
- * Defines the configured text tour entity.
+ * Defines the configured tour entity.
  *
  * @Plugin(
  *   id = "tour",
diff --git a/core/modules/tour/lib/Drupal/tour/TourManager.php b/core/modules/tour/lib/Drupal/tour/TourManager.php
index d160d0b..443886c 100644
--- a/core/modules/tour/lib/Drupal/tour/TourManager.php
+++ b/core/modules/tour/lib/Drupal/tour/TourManager.php
@@ -14,7 +14,7 @@
 use Drupal\Component\Plugin\Discovery\ProcessDecorator;
 
 /**
- * Configurable text tour manager.
+ * Configurable tour manager.
  */
 class TourManager extends PluginManagerBase {
 
diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module
index a34ad85..503b2b1 100644
--- a/core/modules/tour/tour.module
+++ b/core/modules/tour/tour.module
@@ -107,6 +107,11 @@ function tour_toolbar() {
  * Implements hook_preprocess_HOOK() for page.tpl.php.
  */
 function tour_preprocess_page(&$variables) {
+  if (!user_access('access tour')) {
+    return;
+  }
+
+  // @todo replace this with http://drupal.org/node/1918768 once is committed.
   $path = current_path();
   $langcode = language(LANGUAGE_TYPE_CONTENT)->langcode;
   $cid = $path . ':' . $langcode;