diff --git a/editor b/editor
index 751af89ca8c492044437b0b089fe228e061a1bd6..23f20f7bafd8e8c9ddafe5a6768c42f01975b0e7 160000
--- a/editor
+++ b/editor
@@ -1 +1 @@
-Subproject commit 751af89ca8c492044437b0b089fe228e061a1bd6
+Subproject commit 23f20f7bafd8e8c9ddafe5a6768c42f01975b0e7
diff --git a/lang/en/hvp.php b/lang/en/hvp.php
index 0f34e64c4a85ddf82792b5c0a8bd996ad94c4c13..6ce52c88c2ab757017cdc67e906ba6333d160c96 100644
--- a/lang/en/hvp.php
+++ b/lang/en/hvp.php
@@ -83,6 +83,8 @@ $string['enablesavecontentstate'] = 'Save content state';
 $string['enablesavecontentstate_help'] = 'Automatically save the current state of interactive content for each user. This means that the user may pick up where he left off.';
 $string['contentstatefrequency'] = 'Save content state frequency';
 $string['contentstatefrequency_help'] = 'In seconds, how often do you wish the user to auto save their progress. Increase this number if you\'re having issues with many ajax requests';
+$string['enabledlrscontenttypes'] = 'Enable LRS dependent content types';
+$string['enabledlrscontenttypes_help'] = 'Makes it possible to use content types that rely upon a Learning Record Store to function properly, like the Questionnaire content type.';
 
 // Admin menu.
 $string['settings'] = 'H5P Settings';
diff --git a/library b/library
index fd34af6964857e8a2f9f49423d6bf1a109576ac6..6b6d4cd109a0d187f6523fa1428a9a0440917c05 160000
--- a/library
+++ b/library
@@ -1 +1 @@
-Subproject commit fd34af6964857e8a2f9f49423d6bf1a109576ac6
+Subproject commit 6b6d4cd109a0d187f6523fa1428a9a0440917c05
diff --git a/settings.php b/settings.php
index 3f92538cd4d97e6572510ed3aad3bf7f8b71731b..d4902d0f685276785c1807d65b423c8cff08a877 100644
--- a/settings.php
+++ b/settings.php
@@ -56,6 +56,12 @@ if ($ADMIN->fulltree) {
                     get_string('contentstatefrequency', 'hvp'),
                     get_string('contentstatefrequency_help', 'hvp'), 30, PARAM_INT));
 
+    // Content state.
+    $settings->add(
+            new admin_setting_configcheckbox('mod_hvp/enable_lrs_content_types',
+                    get_string('enabledlrscontenttypes', 'hvp'),
+                    get_string('enabledlrscontenttypes_help', 'hvp'), 0));
+
     // Display options for H5P frame.
     $settings->add(new admin_setting_heading('mod_hvp/display_options', get_string('displayoptions', 'hvp'), ''));
     $settings->add(new admin_setting_configcheckbox('mod_hvp/frame', get_string('enableframe', 'hvp'), '', 1));
diff --git a/version.php b/version.php
index 0b28c4b93935deaaa4826a498fe182f0c9058ee4..0d6d7e5af142bceea73b37e25c591c785a21cddf 100644
--- a/version.php
+++ b/version.php
@@ -23,9 +23,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016080903;
+$plugin->version   = 2016092100;
 $plugin->requires  = 2013051403;
 $plugin->cron      = 0;
 $plugin->component = 'mod_hvp';
 $plugin->maturity  = MATURITY_RC;
-$plugin->release   = '1.0-rc.2';
+$plugin->release   = '1.0-rc.3';