diff --git a/lib/tests/behat/behat_forms.php b/lib/tests/behat/behat_forms.php
index 1d08231c48d..569d632728c 100644
--- a/lib/tests/behat/behat_forms.php
+++ b/lib/tests/behat/behat_forms.php
@@ -174,7 +174,7 @@ class behat_forms extends behat_base {
      */
     public function i_press_key_in_the_field($key, $field) {
         if (!$this->running_javascript()) {
-            throw new DriverException('Key press step is not available with Javascript enabled');
+            throw new DriverException('Key press step is not available with Javascript disabled');
         }
         $fld = behat_field_manager::get_form_field_from_label($field, $this);
         $modifier = null;
diff --git a/tag/classes/manage_table.php b/tag/classes/manage_table.php
index 84bdaa2c259..61d3b19375d 100644
--- a/tag/classes/manage_table.php
+++ b/tag/classes/manage_table.php
@@ -119,7 +119,7 @@ class core_tag_manage_table extends table_sql {
                 $total = $grandtotal;
             }
 
-            $this->pagesize($pagesize, $total);
+            $this->pagesize(min($pagesize, $total), $total);
             $this->totalcount = $total;
         }
 
@@ -253,4 +253,4 @@ class core_tag_manage_table extends table_sql {
                 null, array('class' => 'action-icon tagdelete'));
         return $o;
     }
-}
\ No newline at end of file
+}
diff --git a/version.php b/version.php
index 42e683c808d..7cff7974a87 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2015082800.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2015090100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.