diff --git a/classes/redis_store.php b/classes/redis_store.php
index baf82ef0d..2f2a06987 100644
--- a/classes/redis_store.php
+++ b/classes/redis_store.php
@@ -27,6 +27,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+require_once(__DIR__ . '/../.extlib/simplesamlphp/lib/SimpleSAML/Store.php');
+require_once(__DIR__ . '/sentinel.php');
+
 /**
  * Redis store simpleSAMLphp class for auth/saml2.
  *
@@ -111,14 +114,28 @@ protected function bootstrap_redis() {
 
         if (!class_exists('Redis')) {
             throw new \coding_exception('Redis class not found, Redis PHP Extension is probably not installed');
-        }
-        if (empty($CFG->auth_saml2_redis_server)) {
-            throw new \coding_exception('Redis connection string is not configured in $CFG->auth_saml2_redis_server');
+        }        
+        if (!empty($CFG->auth_saml2_redissentinel_servers) && !empty($CFG->auth_saml2_redissentinel_group)) {
+            $servers = explode(',',$CFG->auth_saml2_redissentinel_servers);
+            try {
+                $sentinel = new sentinel($servers);
+                $master = $sentinel->get_master_addr($CFG->auth_saml2_redissentinel_group);
+            } catch(Exception $e) {
+                    debugging('Unable to connect to Redis Sentinel servers: '.$CFG->auth_saml2_redissentinel_servers, DEBUG_ALL);
+                return;
+            }
+        }   
+
+        if (!empty($CFG->auth_saml2_redis_server)) {
+            $server = explode(':',$CFG->auth_saml2_redis_server);
+            $master = new \stdClass();
+            $master->ip = $server[0];
+            $master->port = (count($server)>1)?$server[1]:"6379";
         }
 
         try {
             $redis = new \Redis();
-            $redis->connect($CFG->auth_saml2_redis_server);
+            $redis->connect($master->ip, $master->port);
         } catch (\RedisException $e) {
             throw new \coding_exception("RedisException caught with message: {$e->getMessage()}");
         }
@@ -160,3 +177,4 @@ protected function get_set_options($expire) {
         return $options;
     }
 }
+
diff --git a/classes/sentinel.php b/classes/sentinel.php
new file mode 100644
index 000000000..0a19a5ce7
--- /dev/null
+++ b/classes/sentinel.php
@@ -0,0 +1,246 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Redis Sentinel class
+ *
+ * @package   auth_saml2
+ * @copyright 2017 Catalyst IT
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+namespace auth_saml2;
+
+/**
+ * Redis Sentinel class
+ *
+ * @package   auth_saml2
+ * @copyright 2017 Catalyst IT
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class sentinel {
+
+    private $sentinels = array();
+    
+    public $connecttimeout = 1;
+    public $readtimeout = 1;
+    public $persistent = true;
+
+    private $flags;
+
+    private $connected;
+
+    private $socket;
+
+    private $pingonconnect = false;
+
+    /**
+     * Constructs Sentinel
+     * @param array $sentinels
+     */
+
+    public function __construct($sentinels) {
+
+        $this->sentinels = $sentinels;
+
+        $this->flags = STREAM_CLIENT_CONNECT;
+        
+        $this->connected = false;
+
+    }
+
+    /**
+     * Destructs Sentinel
+     */
+    public function __destruct() {
+        if (!$this->persistent && $this->connected) {
+            $this->disconnect();
+        }
+    }
+
+    /**
+     * Try to connect to one of the sentinel servers defined in $this->sentinels
+     * @return boolean 
+     * @throws \Exception 
+     */
+    public function connecttopool() {
+        if ($this->connected) {
+            return true;
+        }
+        
+        foreach ($this->sentinels as $sentinel) {
+            if ($this->connect($sentinel)) {
+                return true;
+            }
+        }
+
+        throw new \Exception('Unable to connect to sentinel pool');
+    }
+
+    /**
+     * Connects to one sentinel server
+     * @param string $sentinel
+     * @return boolean    
+     */
+    private function connect($sentinel) {        
+
+        if ($this->persistent) {
+            $this->socket = @stream_socket_client($sentinel, $errorno, $errstr, $this->connecttimeout, STREAM_CLIENT_CONNECT | STREAM_CLIENT_PERSISTENT);
+        } else {
+            $this->socket = @stream_socket_client($sentinel, $errorno, $errstr, $this->connecttimeout);
+        }
+
+        if (!$this->socket) {
+            $this->connected = false;
+            return false;
+        }
+
+        $this->connected = true;
+
+        stream_set_blocking($this->socket, true);
+        stream_set_timeout($this->socket, $this->readtimeout); 
+
+        // Test sentinel is alive
+        if ($this->pingonconnect) {
+            fwrite($this->socket, "PING\n");
+            if (trim(fgets($this->socket)) != '+PONG') {
+                fclose($this->socket);
+                $this->connected = false;
+                return false;
+            }
+        }
+        return true; 
+    }
+
+    
+    /**
+     * Disconnects from sentinel socket
+     */
+    public function disconnect() {
+        fclose($this->socket);
+        $this->connected = false;
+
+    }
+
+    /**
+     * Returns ip:port of the redis master of a redis sentinel group named $name
+     * @param string $name 
+     * @return string 
+     */
+    public function get_master_addr($name) {
+
+        $cmd = "get-master-addr-by-name $name";
+
+        $this->command($cmd);
+        if (!$resp = $this->read_response()) {
+            return false;
+        }
+
+        $ret = new \stdClass();
+        $ret->ip = $resp[0];
+        $ret->port = $resp[1];
+
+        return ($ret);
+    }
+
+
+    /**
+     * Send a command to redis cluster
+     * @param string $command
+     * @return boolean
+     * @throws \Exception
+     */
+    private function command($command) {
+        if (!$this->connected) {
+            $this->connecttopool();
+        }
+
+        if (!$this->connected) {
+            return false;
+        }
+        $cmd = "SENTINEL $command\n";
+
+        
+
+        $cmdlen = strlen($cmd);
+        $lastwrite = 0;
+        for ($written = 0; $written < $cmdlen; $written += $lastwrite) {
+            $lastwrite = fwrite($this->socket, substr($cmd, $written));
+
+            if ($lastwrite === false || $lastwrite == 0) {
+                $this->connected = false;
+                throw new \Exception('Failed to write command to stream');
+            }
+        }
+    }
+    
+
+    /**
+     * Read the response of a command
+     * @return mixed
+     * @throws \Exception
+     */
+    private function read_response() {
+        if (!$this->connected) {
+            return false;
+        }
+
+        $resp = fgets($this->socket);
+
+        $type = substr($resp, 0, 1);
+
+        switch($type) {
+
+        // Error response
+        case '-':
+            throw new \Exception('Error response received: '.$resp);
+            break;
+
+        // In-line response
+        case '+':
+            $response = substr($resp, 1);
+            return(substr($resp, 1));
+
+        // Defined size response
+        case '$':
+            $size = (int) substr($resp, 1);
+            $resp = stream_get_contents($this->socket, $size+2);
+            if ($resp === false) {
+                throw new \Exception('Failed to read from stream');
+            }
+            return (trim($resp));
+
+        // Int response
+        case ':':
+            return ((int)substr($reply,1));
+
+        // Multi line response
+        case '*':
+            $multireponse = array();
+            $size = (int) substr($resp, 1);
+
+            for ($i=0;$i<$size; $i++) {
+                $multireponse[] = $this->read_response();
+            }
+            return($multireponse);
+
+
+        // Unknown reesponse
+        default:
+            throw new \Exception('Unknown read response from stream');
+        }
+     }
+
+}