diff --git a/Nette/Application/UI/Presenter.php b/Nette/Application/UI/Presenter.php
index 62be921043..193882f451 100644
--- a/Nette/Application/UI/Presenter.php
+++ b/Nette/Application/UI/Presenter.php
@@ -1346,7 +1346,8 @@ public function getApplication()
 
 
 	/**
-	 * @return Nette\Http\Session
+	 * @param  string
+	 * @return Nette\Http\Session|Nette\Http\SessionSection
 	 */
 	public function getSession($namespace = NULL)
 	{
diff --git a/Nette/Database/Helpers.php b/Nette/Database/Helpers.php
index 526b8f4ca3..89a4e46683 100644
--- a/Nette/Database/Helpers.php
+++ b/Nette/Database/Helpers.php
@@ -80,7 +80,7 @@ public static function dumpResult(Statement $statement)
 	public static function dumpSql($sql)
 	{
 		static $keywords1 = 'SELECT|(?:ON\s+DUPLICATE\s+KEY)?UPDATE|INSERT(?:\s+INTO)?|REPLACE(?:\s+INTO)?|DELETE|CALL|UNION|FROM|WHERE|HAVING|GROUP\s+BY|ORDER\s+BY|LIMIT|OFFSET|SET|VALUES|LEFT\s+JOIN|INNER\s+JOIN|TRUNCATE';
-		static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|RLIKE|REGEXP|TRUE|FALSE';
+		static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|IGNORE|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|[RI]?LIKE|REGEXP|TRUE|FALSE';
 
 		// insert new lines
 		$sql = " $sql ";
diff --git a/Nette/Database/Table/Selection.php b/Nette/Database/Table/Selection.php
index 2cf47a9cd5..7950708f37 100644
--- a/Nette/Database/Table/Selection.php
+++ b/Nette/Database/Table/Selection.php
@@ -561,7 +561,7 @@ public function accessColumn($key, $selectColumn = TRUE)
 
 		if ($key === NULL) {
 			$this->accessedColumns = FALSE;
-			$currentKey = key($this->data);
+			$currentKey = key((array) $this->data);
 		} elseif ($this->accessedColumns !== FALSE) {
 			$this->accessedColumns[$key] = $selectColumn;
 		}
diff --git a/Nette/Database/Table/SqlBuilder.php b/Nette/Database/Table/SqlBuilder.php
index 3c8ac20a1e..63cbb64da6 100644
--- a/Nette/Database/Table/SqlBuilder.php
+++ b/Nette/Database/Table/SqlBuilder.php
@@ -153,7 +153,7 @@ public function addWhere($condition, $parameters = array())
 		$replace = NULL;
 		$placeholderNum = 0;
 		foreach ($args as $arg) {
-			preg_match('#(?:.*?\?.*?){' . $placeholderNum . '}(((?:&|\||^|~|\+|-|\*|/|%|\(|,|<|>|=|(?<=\W|^)(?:REGEXP|ALL|AND|ANY|BETWEEN|EXISTS|IN|R?LIKE|OR|NOT|SOME))\s*)?(?:\(\?\)|\?))#s', $condition, $match, PREG_OFFSET_CAPTURE);
+			preg_match('#(?:.*?\?.*?){' . $placeholderNum . '}(((?:&|\||^|~|\+|-|\*|/|%|\(|,|<|>|=|(?<=\W|^)(?:REGEXP|ALL|AND|ANY|BETWEEN|EXISTS|IN|[IR]?LIKE|OR|NOT|SOME|INTERVAL))\s*)?(?:\(\?\)|\?))#s', $condition, $match, PREG_OFFSET_CAPTURE);
 			$hasOperator = ($match[1][0] === '?' && $match[1][1] === 0) ? TRUE : !empty($match[2][0]);
 
 			if ($arg === NULL) {
diff --git a/Nette/Diagnostics/Debugger.php b/Nette/Diagnostics/Debugger.php
index 89a64c4b0d..f58cdeda82 100644
--- a/Nette/Diagnostics/Debugger.php
+++ b/Nette/Diagnostics/Debugger.php
@@ -501,7 +501,7 @@ public static function _errorHandler($severity, $message, $file, $line, $context
 		);
 
 		$message = 'PHP ' . (isset($types[$severity]) ? $types[$severity] : 'Unknown error') . ": $message";
-		$count = & self::$errorPanel->data["$message|$file|$line"];
+		$count = & self::$errorPanel->data["$file|$line|$message"];
 
 		if ($count++) { // repeated error
 			return NULL;
diff --git a/Nette/Diagnostics/templates/bar.errors.panel.phtml b/Nette/Diagnostics/templates/bar.errors.panel.phtml
index c522695908..156eb02691 100644
--- a/Nette/Diagnostics/templates/bar.errors.panel.phtml
+++ b/Nette/Diagnostics/templates/bar.errors.panel.phtml
@@ -16,7 +16,7 @@ use Nette;
 <div class="nette-inner">
 <table>
 <?php $i = 0 ?>
-<?php foreach ($data as $item => $count): list($message, $file, $line) = explode('|', $item) ?>
+<?php foreach ($data as $item => $count): list($file, $line, $message) = explode('|', $item, 3) ?>
 <tr class="<?php echo $i++ % 2 ? 'nette-alt' : '' ?>">
 	<td class="nette-right"><?php echo $count ? "$count\xC3\x97" : '' ?></td>
 	<td><pre><?php echo htmlspecialchars(Nette\Utils\Strings::fixEncoding($message)), ' in ', Helpers::editorLink($file, $line), ':', $line ?></pre></td>
diff --git a/Nette/Diagnostics/templates/bar.errors.tab.phtml b/Nette/Diagnostics/templates/bar.errors.tab.phtml
index 4eb5b15f77..8d7740b78c 100644
--- a/Nette/Diagnostics/templates/bar.errors.tab.phtml
+++ b/Nette/Diagnostics/templates/bar.errors.tab.phtml
@@ -12,4 +12,4 @@ namespace Nette\Diagnostics;
 use Nette;
 ?>
 <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIsSURBVDjLpVNLSJQBEP7+h6uu62vLVAJDW1KQTMrINQ1vPQzq1GOpa9EppGOHLh0kCEKL7JBEhVCHihAsESyJiE4FWShGRmauu7KYiv6Pma+DGoFrBQ7MzGFmPr5vmDFIYj1mr1WYfrHPovA9VVOqbC7e/1rS9ZlrAVDYHig5WB0oPtBI0TNrUiC5yhP9jeF4X8NPcWfopoY48XT39PjjXeF0vWkZqOjd7LJYrmGasHPCCJbHwhS9/F8M4s8baid764Xi0Ilfp5voorpJfn2wwx/r3l77TwZUvR+qajXVn8PnvocYfXYH6k2ioOaCpaIdf11ivDcayyiMVudsOYqFb60gARJYHG9DbqQFmSVNjaO3K2NpAeK90ZCqtgcrjkP9aUCXp0moetDFEeRXnYCKXhm+uTW0CkBFu4JlxzZkFlbASz4CQGQVBFeEwZm8geyiMuRVntzsL3oXV+YMkvjRsydC1U+lhwZsWXgHb+oWVAEzIwvzyVlk5igsi7DymmHlHsFQR50rjl+981Jy1Fw6Gu0ObTtnU+cgs28AKgDiy+Awpj5OACBAhZ/qh2HOo6i+NeA73jUAML4/qWux8mt6NjW1w599CS9xb0mSEqQBEDAtwqALUmBaG5FV3oYPnTHMjAwetlWksyByaukxQg2wQ9FlccaK/OXA3/uAEUDp3rNIDQ1ctSk6kHh1/jRFoaL4M4snEMeD73gQx4M4PsT1IZ5AfYH68tZY7zv/ApRMY9mnuVMvAAAAAElFTkSuQmCC"
-/><span class="nette-warning"><?php echo array_sum($data) ?> errors</span>
+/><span class="nette-warning"><?php echo $sum = array_sum($data), $sum > 1 ? ' errors' : ' error' ?></span>
diff --git a/Nette/Forms/Controls/BaseControl.php b/Nette/Forms/Controls/BaseControl.php
index b385b450f2..e498c944b0 100644
--- a/Nette/Forms/Controls/BaseControl.php
+++ b/Nette/Forms/Controls/BaseControl.php
@@ -551,6 +551,16 @@ public static function validateEqual(IControl $control, $arg)
 	}
 
 
+	/**
+	 * Is control's value not equal with second parameter?
+	 * @return bool
+	 */
+	public static function validateNotEqual(IControl $control, $arg)
+	{
+		return !static::validateEqual($control, $arg);
+	}
+
+
 	/**
 	 * Filled validator: is control filled?
 	 * @return bool
@@ -561,6 +571,16 @@ public static function validateFilled(IControl $control)
 	}
 
 
+	/**
+	 * Is control not filled?
+	 * @return bool
+	 */
+	public static function validateBlank(IControl $control)
+	{
+		return !$control->isFilled();
+	}
+
+
 	/**
 	 * Valid validator: is control valid?
 	 * @return bool
diff --git a/Nette/Forms/Form.php b/Nette/Forms/Form.php
index ff9e66782c..fd276203e6 100644
--- a/Nette/Forms/Form.php
+++ b/Nette/Forms/Form.php
@@ -36,7 +36,10 @@ class Form extends Container
 	/** validator */
 	const EQUAL = ':equal',
 		IS_IN = ':equal',
+		NOT_EQUAL = ':notEqual',
 		FILLED = ':filled',
+		BLANK = ':blank',
+		REQUIRED = self::FILLED,
 		VALID = ':valid';
 
 	// CSRF protection
@@ -249,7 +252,7 @@ public function addGroup($caption = NULL, $setAsCurrent = TRUE)
 
 	/**
 	 * Removes fieldset group from form.
-	 * @param  string|FormGroup
+	 * @param  string|ControlGroup
 	 * @return void
 	 */
 	public function removeGroup($name)
@@ -275,7 +278,7 @@ public function removeGroup($name)
 
 	/**
 	 * Returns all defined groups.
-	 * @return FormGroup[]
+	 * @return ControlGroup[]
 	 */
 	public function getGroups()
 	{
diff --git a/Nette/Templating/Helpers.php b/Nette/Templating/Helpers.php
index 78fdd2ee6e..127df2901e 100644
--- a/Nette/Templating/Helpers.php
+++ b/Nette/Templating/Helpers.php
@@ -118,7 +118,7 @@ public static function escapeCss($s)
 
 
 	/**
-	 * Escapes string for use inside JavaScript template.
+	 * Escapes variables for use inside <script>.
 	 * @param  mixed  UTF-8 encoding
 	 * @return string
 	 */
@@ -127,7 +127,7 @@ public static function escapeJs($s)
 		if (is_object($s) && ($s instanceof ITemplate || $s instanceof Html || $s instanceof Form)) {
 			$s = $s->__toString(TRUE);
 		}
-		return str_replace(']]>', ']]\x3E', Nette\Utils\Json::encode($s));
+		return str_replace(array(']]>', '<!'), array(']]\x3E', '\x3C!'), Nette\Utils\Json::encode($s));
 	}
 
 
diff --git a/Nette/common/DateTime.php b/Nette/common/DateTime.php
index 05ef0d61e0..0a05870afb 100644
--- a/Nette/common/DateTime.php
+++ b/Nette/common/DateTime.php
@@ -48,7 +48,7 @@ class DateTime extends \DateTime
 	public static function from($time)
 	{
 		if ($time instanceof \DateTime) {
-			return new self($time->format('Y-m-d H:i:s'), $time->getTimezone());
+			return new static($time->format('Y-m-d H:i:s'), $time->getTimezone());
 
 		} elseif (is_numeric($time)) {
 			if ($time <= self::YEAR) {
diff --git a/Nette/common/Framework.php b/Nette/common/Framework.php
index 07caa39bf2..a565970cde 100644
--- a/Nette/common/Framework.php
+++ b/Nette/common/Framework.php
@@ -24,8 +24,8 @@ final class Framework
 
 	/** Nette Framework version identification */
 	const NAME = 'Nette Framework',
-		VERSION = '2.0.12',
-		VERSION_ID = 20012,
+		VERSION = '2.0.13',
+		VERSION_ID = 20013,
 		REVISION = '$WCREV$ released on $WCDATE$';
 
 	/** @var bool set to TRUE if your host has disabled function ini_set */
diff --git a/Nette/loader.php b/Nette/loader.php
index 9e2802114d..039a8eff7a 100644
--- a/Nette/loader.php
+++ b/Nette/loader.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Nette Framework (version 2.0.12 released on $WCDATE$, http://nette.org)
+ * Nette Framework (version 2.0.13 released on $WCDATE$, http://nette.org)
  *
  * Copyright (c) 2004, 2013 David Grudl (http://davidgrudl.com)
  *
@@ -38,7 +38,7 @@
  */
 define('NETTE', TRUE);
 define('NETTE_DIR', __DIR__);
-define('NETTE_VERSION_ID', 20012); // v2.0.12
+define('NETTE_VERSION_ID', 20013); // v2.0.13
 define('NETTE_PACKAGE', '5.3');
 
 
diff --git a/client-side/netteForms.js b/client-side/netteForms.js
index 6e793425c3..39b972a34a 100644
--- a/client-side/netteForms.js
+++ b/client-side/netteForms.js
@@ -109,7 +109,7 @@ Nette.validateControl = function(elem, rules, onlyCheck) {
  */
 Nette.validateForm = function(sender) {
 	var form = sender.form || sender, scope = false;
-	if (form['nette-submittedBy'] && form['nette-submittedBy'].getAttribute('formnovalidate')) {
+	if (form['nette-submittedBy'] && form['nette-submittedBy'].getAttribute('formnovalidate') !== null) {
 		var scopeArr = Nette.parseJSON(form['nette-submittedBy'].getAttribute('data-nette-validation-scope'));
 		if (scopeArr.length) {
 			scope = new RegExp('^(' + scopeArr.join('-|') + '-)');
@@ -174,6 +174,10 @@ Nette.validators = {
 		return val !== '' && val !== false && val !== null;
 	},
 
+	blank: function(elem, arg, val) {
+		return !Nette.validators.filled(elem, arg, val);
+	},
+
 	valid: function(elem, arg, val) {
 		return Nette.validateControl(elem, null, true);
 	},
@@ -191,6 +195,10 @@ Nette.validators = {
 		return false;
 	},
 
+	notEqual: function(elem, arg, val) {
+		return arg === undefined ? null : !Nette.validators.equal(elem, arg, val);
+	},
+
 	minLength: function(elem, arg, val) {
 		return val.length >= arg;
 	},
diff --git a/tests/Nette/Database/Table.cache.rows.phpt b/tests/Nette/Database/Table.cache.rows.phpt
index dec37a3451..ae0bc487b4 100644
--- a/tests/Nette/Database/Table.cache.rows.phpt
+++ b/tests/Nette/Database/Table.cache.rows.phpt
@@ -55,3 +55,16 @@ $books[] = $bookSelection->fetch()->toArray();
 Assert::same(1, $books[0]['id']);
 Assert::same(2, $books[1]['id']);
 Assert::same(3, $books[2]['id']);
+
+
+
+$row = $connection->table('author')->insert(array(
+	'id' => 14,
+	'name' => 'Eddard Stark',
+	'web' => 'http://example.com',
+));  // INSERT INTO `author` (`id`, `name`, `web`) VALUES (14, 'Edard Stark', 'http://example.com')
+Assert::true(is_array($row->toArray()));
+
+
+$row = $connection->table('author')->where('id', 14)->fetch();
+Assert::true(is_array($row->toArray()));
diff --git a/tests/Nette/Latte/expected/macros.general.html.html b/tests/Nette/Latte/expected/macros.general.html.html
index 309762fdeb..4a2e3b1a32 100644
--- a/tests/Nette/Latte/expected/macros.general.html.html
+++ b/tests/Nette/Latte/expected/macros.general.html.html
@@ -45,7 +45,7 @@
 	<li id="item-3" class="odd">Paul</li>
 
 
-	<li id="item-4" class="even">]]&gt;</li>
+	<li id="item-4" class="even">]]&gt; &lt;!--</li>
 	</ul>
 
 
@@ -64,7 +64,7 @@
 <!--
 alert('</div>');
 
-var prop = ["John","Mary","Paul","]]\x3E"];
+var prop = ["John","Mary","Paul","]]\x3E \x3C!--"];
 
 document.getElementById("some&<>\"'\/chars").style.backgroundColor = 'red';
 
@@ -76,7 +76,7 @@
 <script>
 /* <![CDATA[ */
 
-var prop2 = ["John","Mary","Paul","]]\x3E"];
+var prop2 = ["John","Mary","Paul","]]\x3E \x3C!--"];
 
 /* ]]> */
 </script>
@@ -123,7 +123,7 @@
 	<li>John</li>
 	<li>Mary</li>
 	<li>Paul</li>
-	<li>]]&gt;</li>
+	<li>]]&gt; &lt;!--</li>
 </ul>
 
 <ul title="for">
diff --git a/tests/Nette/Latte/expected/macros.general.xhtml.html b/tests/Nette/Latte/expected/macros.general.xhtml.html
index a0fbf99fd2..de18af5cf7 100644
--- a/tests/Nette/Latte/expected/macros.general.xhtml.html
+++ b/tests/Nette/Latte/expected/macros.general.xhtml.html
@@ -45,7 +45,7 @@
 	<li id="item-3" class="odd">Paul</li>
 
 
-	<li id="item-4" class="even">]]&gt;</li>
+	<li id="item-4" class="even">]]&gt; &lt;!--</li>
 	</ul>
 
 
@@ -64,7 +64,7 @@
 <!--
 alert('</div>');
 
-var prop = ["John","Mary","Paul","]]\x3E"];
+var prop = ["John","Mary","Paul","]]\x3E \x3C!--"];
 
 document.getElementById("some&<>\"'\/chars").style.backgroundColor = 'red';
 
@@ -76,7 +76,7 @@
 <script>
 /* <![CDATA[ */
 
-var prop2 = ["John","Mary","Paul","]]\x3E"];
+var prop2 = ["John","Mary","Paul","]]\x3E \x3C!--"];
 
 /* ]]> */
 </script>
@@ -123,7 +123,7 @@
 	<li>John</li>
 	<li>Mary</li>
 	<li>Paul</li>
-	<li>]]&gt;</li>
+	<li>]]&gt; &lt;!--</li>
 </ul>
 
 <ul title="for">
diff --git a/tests/Nette/Latte/expected/macros.xml.html b/tests/Nette/Latte/expected/macros.xml.html
index 39cd20d339..ea973be08a 100644
--- a/tests/Nette/Latte/expected/macros.xml.html
+++ b/tests/Nette/Latte/expected/macros.xml.html
@@ -47,7 +47,7 @@
 	<li>John</li>
 	<li>Mary</li>
 	<li>Paul</li>
-	<li>]]&gt;</li>
+	<li>]]&gt; &lt;!--</li>
 </ul>
 
 <p>
diff --git a/tests/Nette/Latte/macros.general.html.phpt b/tests/Nette/Latte/macros.general.html.phpt
index 532e33ddd0..862af6adbd 100644
--- a/tests/Nette/Latte/macros.general.html.phpt
+++ b/tests/Nette/Latte/macros.general.html.phpt
@@ -28,7 +28,7 @@ $template->registerHelperLoader('Nette\Templating\Helpers::loader');
 
 $template->hello = '<i>Hello</i>';
 $template->xss = 'some&<>"\'/chars';
-$template->people = array('John', 'Mary', 'Paul', ']]>');
+$template->people = array('John', 'Mary', 'Paul', ']]> <!--');
 $template->menu = array('about', array('product1', 'product2'), 'contact');
 $template->el = Html::el('div')->title('1/2"');
 
diff --git a/tests/Nette/Latte/macros.general.xhtml.phpt b/tests/Nette/Latte/macros.general.xhtml.phpt
index a0e8090eae..631c501574 100644
--- a/tests/Nette/Latte/macros.general.xhtml.phpt
+++ b/tests/Nette/Latte/macros.general.xhtml.phpt
@@ -26,7 +26,7 @@ $template->registerHelperLoader('Nette\Templating\Helpers::loader');
 
 $template->hello = '<i>Hello</i>';
 $template->xss = 'some&<>"\'/chars';
-$template->people = array('John', 'Mary', 'Paul', ']]>');
+$template->people = array('John', 'Mary', 'Paul', ']]> <!--');
 $template->menu = array('about', array('product1', 'product2'), 'contact');
 $template->el = Html::el('div')->title('1/2"');
 
diff --git a/tests/Nette/Latte/macros.xml.phpt b/tests/Nette/Latte/macros.xml.phpt
index 8c60cc9cb4..6c307d69ff 100644
--- a/tests/Nette/Latte/macros.xml.phpt
+++ b/tests/Nette/Latte/macros.xml.phpt
@@ -27,7 +27,7 @@ $template->registerHelperLoader('Nette\Templating\Helpers::loader');
 
 $template->hello = '<i>Hello</i>';
 $template->id = ':/item';
-$template->people = array('John', 'Mary', 'Paul', ']]>');
+$template->people = array('John', 'Mary', 'Paul', ']]> <!--');
 $template->comment = 'test -- comment';
 $template->netteHttpResponse = new Nette\Http\Response;
 $template->el = Html::el('div')->title('1/2"');
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 80a8f3bbaf..f226f665e3 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -16,9 +16,10 @@ jobsNum=20
 phpIni="$dir/php-unix.ini"
 
 # Command line arguments processing
-for i in `seq 1 $#`; do
+i=$#
+while [ $i -gt 0 ]; do
 	if [ "$1" = "-j" ]; then
-		shift
+		shift && i=$(($i - 1))
 		if [ -z "$1" ]; then
 			echo "Missing argument for -j option." >&2
 			exit 2
@@ -26,7 +27,7 @@ for i in `seq 1 $#`; do
 		jobsNum="$1"
 
 	elif [ "$1" = "-c" ]; then
-		shift
+		shift && i=$(($i - 1))
 		if [ -z "$1" ]; then
 			echo "Missing argument for -c option." >&2
 			exit 2
@@ -36,7 +37,7 @@ for i in `seq 1 $#`; do
 	else
 		set -- "$@" "$1"
 	fi
-	shift
+	shift && i=$(($i - 1))
 done
 
 # Run tests with script's arguments, doubled -c option intentionally
diff --git a/version.txt b/version.txt
index 08d2769484..f75d68a24d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-Nette Framework 2.0.12 (revision $WCREV$ released on $WCDATE$)
+Nette Framework 2.0.13 (revision $WCREV$ released on $WCDATE$)