diff --git a/install/lang/ca/install.php b/install/lang/ca/install.php
index fb62037fd3b..df0275c7890 100644
--- a/install/lang/ca/install.php
+++ b/install/lang/ca/install.php
@@ -90,5 +90,5 @@ $string['welcomep50'] = 'L\'ús de totes les aplicacions d\'aquest paquet és go
 <a href="http://www.opensource.org/docs/definition_plain.html">codi font obert</a> i es distribueix
 sota llicència <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
 $string['welcomep60'] = 'Les pàgines següents us guiaran per una sèrie de passos fàcils de seguir per configurar <strong>Moodle</strong> en el vostre ordinador. Podeu acceptar els paràmetres per defecte o, opcionalment, modificar-los perquè s\'ajustin a les vostres necessitats.';
-$string['welcomep70'] = 'Feu clic en el botó "Següent" per continuar la configuració de <strong>Moodle</strong>.';
+$string['welcomep70'] = 'Feu clic al botó «Següent» per continuar amb la configuració de <strong>Moodle</strong>.';
 $string['wwwroot'] = 'Adreça web';
diff --git a/install/lang/ro/error.php b/install/lang/ro/error.php
index b6a702f823b..8a8e6035303 100644
--- a/install/lang/ro/error.php
+++ b/install/lang/ro/error.php
@@ -30,6 +30,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['cannotcreatedboninstall'] = '<p>Nu se poate crea baza de date.</p>
+<p>Baza de date specificată nu există iar utilizatorul nu are permisiunea de a crea baza de date.</p>
+<p>Admistratorul site-ului trebuie să verfice configurarea bazei de date.</p>';
 $string['cannotcreatelangdir'] = 'Nu se poate crea un director lang';
 $string['cannotcreatetempdir'] = 'Nu se poate crea director temporar';
 $string['cannotdownloadcomponents'] = 'Nu se pot descărca componente';
diff --git a/lib/flowplayer/lib.php b/lib/flowplayer/lib.php
index fa15b381dda..f9206c46447 100644
--- a/lib/flowplayer/lib.php
+++ b/lib/flowplayer/lib.php
@@ -36,7 +36,7 @@ function flowplayer_send_flash_content($filename) {
     // Note: Do not use any fancy APIs here, this must work in all supported versions.
 
     // No url params.
-    if (!empty($_GET) or !empty($_POST) or !empty($_REQUEST)) {
+    if (!empty($_GET) or !empty($_POST)) {
         header("HTTP/1.1 404 Not Found");
         die;
     }
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 800e47c96ab..43f81ea1569 100644
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -961,6 +961,8 @@ function scorm_pluginfile($course, $cm, $context, $filearea, $args, $forcedownlo
 
     // Check SCORM availability.
     if (!$canmanageactivity) {
+        require_once($CFG->dirroot.'/mod/scorm/locallib.php');
+
         $scorm = $DB->get_record('scorm', array('id' => $cm->instance), 'id, timeopen, timeclose', MUST_EXIST);
         list($available, $warnings) = scorm_get_availability_status($scorm);
         if (!$available) {
diff --git a/report/log/classes/table_log.php b/report/log/classes/table_log.php
index 8df6db9285d..324e6b40d15 100644
--- a/report/log/classes/table_log.php
+++ b/report/log/classes/table_log.php
@@ -112,8 +112,13 @@ class report_log_table_log extends table_sql {
      * @return string HTML for the time column
      */
     public function col_time($event) {
-        $recenttimestr = get_string('strftimerecent', 'core_langconfig');
-        return userdate($event->timecreated, $recenttimestr);
+
+        if (empty($this->download)) {
+            $dateformat = get_string('strftimerecent', 'core_langconfig');
+        } else {
+            $dateformat = get_string('strftimedatetimeshort', 'core_langconfig');
+        }
+        return userdate($event->timecreated, $dateformat);
     }
 
     /**
diff --git a/version.php b/version.php
index 831cae5b400..e10421c57b2 100644
--- a/version.php
+++ b/version.php
@@ -29,11 +29,11 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2014051210.05;              // 20140512      = branching date YYYYMMDD - do not modify!
+$version  = 2014051211.01;              // 20140512      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 
-$release  = '2.7.10+ (Build: 20151031)'; // Human-friendly version name
+$release  = '2.7.11+ (Build: 20151110)'; // Human-friendly version name
 
 $branch   = '27';                       // This version's branch.
 $maturity = MATURITY_STABLE;             // This version's maturity level.