Merge remote-tracking branch 'origin/2.6' into 3.0

Conflicts:
	lib/Cake/Console/cake
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Network/Http/HttpSocketResponse.php
	lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/View/Helper/FormHelper.php

src/Utility/Inflector.php

@@ -55,7 +55,7 @@ class Inflector {
 			'/$/' => 's',
 		),
 		'uninflected' => array(
-			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people'
+			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people', 'feedback'
 		),
 		'irregular' => array(
 			'atlas' => 'atlases',
@@ -142,7 +142,7 @@ class Inflector {
 			'/s$/i' => ''
 		),
 		'uninflected' => array(
-			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss'
+			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss', 'feedback'
 		),
 		'irregular' => array(
 			'foes' => 'foe',

tests/TestCase/View/Widget/SelectBoxTest.php

@@ -476,6 +476,23 @@ class SelectBoxTest extends TestCase {
 			'/select'
 		];
 		$this->assertTags($result, $expected);
+
+		$select = new SelectBox($this->templates);
+		$data = [
+			'disabled' => [1],
+			'name' => 'numbers',
+			'options' => ['1' => 'One', '2' => 'Two'],
+		];
+		$result = $select->render($data);
+		$expected = [
+			'select' => [
+				'name' => 'numbers',
+			],
+			['option' => ['value' => '1', 'disabled' => 'disabled']], 'One', '/option',
+			['option' => ['value' => '2']], 'Two', '/option',
+			'/select'
+		];
+		$this->assertTags($result, $expected);
 	}
 
 /**