From e3976ff62b96aeceba7ce9b8ce3eec8f9d58582a Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Sun, 19 Feb 2017 13:17:15 -0500
Subject: [PATCH 01/18] Update JUriTest to only test JUri class features
 (#14142)

---
 .../suites/libraries/joomla/uri/JURITest.php  | 578 ++----------------
 1 file changed, 47 insertions(+), 531 deletions(-)

diff --git a/tests/unit/suites/libraries/joomla/uri/JURITest.php b/tests/unit/suites/libraries/joomla/uri/JURITest.php
index b7fa86f4995e9..735a874db50e3 100644
--- a/tests/unit/suites/libraries/joomla/uri/JURITest.php
+++ b/tests/unit/suites/libraries/joomla/uri/JURITest.php
@@ -9,7 +9,6 @@
 
 /**
  * Test class for JUri.
- * Generated by PHPUnit on 2009-10-09 at 14:03:19.
  *
  * @package     Joomla.UnitTest
  * @subpackage  Uri
@@ -25,27 +24,48 @@ class JUriTest extends PHPUnit_Framework_TestCase
 	/**
 	 * Backup of the SERVER superglobal
 	 *
-	 * @var  array
+	 * @var    array
 	 * @since  3.6
 	 */
 	protected $backupServer;
 
 	/**
-	 * Test the __toString method.
+	 * Sets up the fixture, for example, opens a network connection.
+	 * This method is called before a test is executed.
 	 *
 	 * @return  void
 	 *
 	 * @since   11.1
-	 * @covers  JUri::__toString
 	 */
-	public function test__toString()
+	protected function setUp()
 	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
+		parent::setUp();
+		$this->backupServer = $_SERVER;
+		JUri::reset();
 
-		$this->assertThat(
-			$this->object->__toString(),
-			$this->equalTo('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment')
-		);
+		$_SERVER['HTTP_HOST'] = 'www.example.com:80';
+		$_SERVER['SCRIPT_NAME'] = '/joomla/index.php';
+		$_SERVER['PHP_SELF'] = '/joomla/index.php';
+		$_SERVER['REQUEST_URI'] = '/joomla/index.php?var=value 10';
+
+		$this->object = new JUri;
+	}
+
+	/**
+	 * Tears down the fixture, for example, closes a network connection.
+	 * This method is called after a test is executed.
+	 *
+	 * @return void
+	 *
+	 * @see     PHPUnit_Framework_TestCase::tearDown()
+	 * @since   3.6
+	 */
+	protected function tearDown()
+	{
+		$_SERVER = $this->backupServer;
+		unset($this->backupServer);
+		unset($this->object);
+		parent::tearDown();
 	}
 
 	/**
@@ -58,24 +78,13 @@ public function test__toString()
 	 */
 	public function testGetInstance()
 	{
-		$return = JUri::getInstance('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
+		$customUri = JUri::getInstance('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
+		$defaultUri = JUri::getInstance();
 
-		$this->assertThat(
-			$return,
-			$this->equalTo($this->object)
-		);
-
-		$this->object->parse('http://www.example.com:80/joomla/index.php?var=value 10');
-		$_SERVER['HTTP_HOST'] = 'www.example.com:80';
-		$_SERVER['SCRIPT_NAME'] = '/joomla/index.php';
-		$_SERVER['PHP_SELF'] = '/joomla/index.php';
-		$_SERVER['REQUEST_URI'] = '/joomla/index.php?var=value 10';
-
-		$return = JUri::getInstance();
-		$this->assertThat(
-			$return,
-			$this->equalTo($this->object)
+		$this->assertNotSame(
+			$customUri,
+			$defaultUri,
+			'JUri::getInstance() should not return the same object for different URIs'
 		);
 	}
 
@@ -89,9 +98,9 @@ public function testGetInstance()
 	 */
 	public function testRoot()
 	{
-		$this->assertThat(
+		$this->assertSame(
 			JUri::root(false, '/administrator'),
-			$this->equalTo('http://www.example.com:80/administrator/')
+			'http://www.example.com:80/administrator/'
 		);
 	}
 
@@ -105,9 +114,9 @@ public function testRoot()
 	 */
 	public function testCurrent()
 	{
-		$this->assertThat(
+		$this->assertSame(
 			JUri::current(),
-			$this->equalTo('http://www.example.com:80/joomla/index.php')
+			'http://www.example.com:80/joomla/index.php'
 		);
 	}
 
@@ -121,204 +130,7 @@ public function testCurrent()
 	 */
 	public function testParse()
 	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value&amp;test=true#fragment');
-
-		$this->assertThat(
-			$this->object->getHost(),
-			$this->equalTo('www.example.com')
-		);
-
-		$this->assertThat(
-			$this->object->getPath(),
-			$this->equalTo('/path/file.html')
-		);
-
-		$this->assertThat(
-			$this->object->getScheme(),
-			$this->equalTo('http')
-		);
-	}
-
-	/**
-	 * Test the toString method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::toString
-	 */
-	public function testToString()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->toString(),
-			$this->equalTo('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment')
-		);
-
-		$this->object->setQuery('somevar=somevalue');
-		$this->object->setVar('somevar2', 'somevalue2');
-		$this->object->setScheme('ftp');
-		$this->object->setUser('root');
-		$this->object->setPass('secret');
-		$this->object->setHost('www.example.org');
-		$this->object->setPort('8888');
-		$this->object->setFragment('someFragment');
-		$this->object->setPath('/this/is/a/path/to/a/file');
-
-		$this->assertThat(
-			$this->object->toString(),
-			$this->equalTo('ftp://root:secret@www.example.org:8888/this/is/a/path/to/a/file?somevar=somevalue&somevar2=somevalue2#someFragment')
-		);
-	}
-
-	/**
-	 * Test the setVar method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::setVar
-	 */
-	public function testSetVar()
-	{
-		$this->object->setVar('somevar', 'somevalue');
-
-		$this->assertThat(
-			$this->object->getVar('somevar'),
-			$this->equalTo('somevalue')
-		);
-	}
-
-	/**
-	 * Test the hasVar method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::hasVar
-	 */
-	public function testHasVar()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->hasVar('somevar'),
-			$this->equalTo(false)
-		);
-
-		$this->assertThat(
-			$this->object->hasVar('var'),
-			$this->equalTo(true)
-		);
-	}
-
-	/**
-	 * Test the getVar method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::getVar
-	 */
-	public function testGetVar()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getVar('var'),
-			$this->equalTo('value')
-		);
-
-		$this->assertThat(
-			$this->object->getVar('var2'),
-			$this->equalTo('')
-		);
-
-		$this->assertThat(
-			$this->object->getVar('var2', 'default'),
-			$this->equalTo('default')
-		);
-	}
-
-	/**
-	 * Test the delVar method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::delVar
-	 */
-	public function testDelVar()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getVar('var'),
-			$this->equalTo('value')
-		);
-
-		$this->object->delVar('var');
-
-		$this->assertThat(
-			$this->object->getVar('var'),
-			$this->equalTo('')
-		);
-	}
-
-	/**
-	 * Test the setQuery method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::setQuery
-	 */
-	public function testSetQuery()
-	{
-		$this->object->setQuery('somevar=somevalue');
-
-		$this->assertThat(
-			$this->object->getQuery(),
-			$this->equalTo('somevar=somevalue')
-		);
-
-		$this->object->setQuery('somevar=somevalue&amp;test=true');
-
-		$this->assertThat(
-			$this->object->getQuery(),
-			$this->equalTo('somevar=somevalue&test=true')
-		);
-
-		$this->object->setQuery(array('somevar' => 'somevalue', 'test' => 'true'));
-
-		$this->assertThat(
-			$this->object->getQuery(),
-			$this->equalTo('somevar=somevalue&test=true')
-		);
-	}
-
-	/**
-	 * Test the getQuery method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::getQuery
-	 */
-	public function testGetQuery()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getQuery(),
-			$this->equalTo('var=value')
-		);
-
-		$this->assertThat(
-			$this->object->getQuery(true),
-			$this->equalTo(array('var' => 'value'))
-		);
+		$this->assertTrue($this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value&amp;test=true#fragment'));
 	}
 
 	/**
@@ -342,205 +154,7 @@ public function testBuildQuery()
 			'v' => 45);
 
 		$expected = 'field[price][from]=5&field[price][to]=10&field[name]=foo&v=45';
-		$this->assertEquals($expected, JUri::buildQuery($params));
-	}
-
-	/**
-	 * Test the getScheme method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::getScheme
-	 */
-	public function testGetScheme()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getScheme(),
-			$this->equalTo('http')
-		);
-	}
-
-	/**
-	 * Test the setScheme method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::setScheme
-	 */
-	public function testSetScheme()
-	{
-		$this->object->setScheme('ftp');
-
-		$this->assertThat(
-			$this->object->getScheme(),
-			$this->equalTo('ftp')
-		);
-	}
-
-	/**
-	 * Test the getUser method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::getUser
-	 */
-	public function testGetUser()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getUser(),
-			$this->equalTo('someuser')
-		);
-	}
-
-	/**
-	 * Test the setUser method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::setUser
-	 */
-	public function testSetUser()
-	{
-		$this->object->setUser('root');
-
-		$this->assertThat(
-			$this->object->getUser(),
-			$this->equalTo('root')
-		);
-	}
-
-	/**
-	 * Test the getPass method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::getPass
-	 */
-	public function testGetPass()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getPass(),
-			$this->equalTo('somepass')
-		);
-	}
-
-	/**
-	 * Test the setPass method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::setPass
-	 */
-	public function testSetPass()
-	{
-		$this->object->setPass('secret');
-
-		$this->assertThat(
-			$this->object->getPass(),
-			$this->equalTo('secret')
-		);
-	}
-
-	/**
-	 * Test the getHost method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::getHost
-	 */
-	public function testGetHost()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getHost(),
-			$this->equalTo('www.example.com')
-		);
-	}
-
-	/**
-	 * Test the setHost method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::setHost
-	 */
-	public function testSetHost()
-	{
-		$this->object->setHost('www.example.org');
-
-		$this->assertThat(
-			$this->object->getHost(),
-			$this->equalTo('www.example.org')
-		);
-	}
-
-	/**
-	 * Test the getPort method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::getPort
-	 */
-	public function testGetPort()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getPort(),
-			$this->equalTo('80')
-		);
-	}
-
-	/**
-	 * Test the setPort method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::setPort
-	 */
-	public function testSetPort()
-	{
-		$this->object->setPort('8888');
-
-		$this->assertThat(
-			$this->object->getPort(),
-			$this->equalTo('8888')
-		);
-	}
-
-	/**
-	 * Test the getPath method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::getPath
-	 */
-	public function testGetPath()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getPath(),
-			$this->equalTo('/path/file.html')
-		);
+		$this->assertEquals($expected, JUri::buildQuery($params), 'The query string was not built correctly.');
 	}
 
 	/**
@@ -555,70 +169,11 @@ public function testSetPath()
 	{
 		$this->object->setPath('/this/is/a/path/to/a/file.htm');
 
-		$this->assertThat(
-			$this->object->getPath(),
-			$this->equalTo('/this/is/a/path/to/a/file.htm')
-		);
-	}
-
-	/**
-	 * Test the getFragment method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::getFragment
-	 */
-	public function testGetFragment()
-	{
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->getFragment(),
-			$this->equalTo('fragment')
-		);
-	}
-
-	/**
-	 * Test the setFragment method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::setFragment
-	 */
-	public function testSetFragment()
-	{
-		$this->object->setFragment('someFragment');
-
-		$this->assertThat(
-			$this->object->getFragment(),
-			$this->equalTo('someFragment')
-		);
-	}
-
-	/**
-	 * Test the isSSL method.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 * @covers  JUri::isSsl
-	 */
-	public function testIsSsl()
-	{
-		$this->object->parse('https://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->isSsl(),
-			$this->equalTo(true)
-		);
-
-		$this->object->parse('http://someuser:somepass@www.example.com:80/path/file.html?var=value#fragment');
-
-		$this->assertThat(
-			$this->object->isSsl(),
-			$this->equalTo(false)
+		$this->assertAttributeSame(
+			'/this/is/a/path/to/a/file.htm',
+			'path',
+			$this->object,
+			"The URI's path attribute was not set correctly."
 		);
 	}
 
@@ -851,43 +406,4 @@ public function testPregMatch()
 			'wwwhexample.com should NOT be internal'
 		);
 	}
-
-	/**
-	 * Sets up the fixture, for example, opens a network connection.
-	 * This method is called before a test is executed.
-	 *
-	 * @return  void
-	 *
-	 * @since   11.1
-	 */
-	protected function setUp()
-	{
-		parent::setUp();
-		$this->backupServer = $_SERVER;
-		JUri::reset();
-
-		$_SERVER['HTTP_HOST'] = 'www.example.com:80';
-		$_SERVER['SCRIPT_NAME'] = '/joomla/index.php';
-		$_SERVER['PHP_SELF'] = '/joomla/index.php';
-		$_SERVER['REQUEST_URI'] = '/joomla/index.php?var=value 10';
-
-		$this->object = new JUri;
-	}
-
-	/**
-	 * Tears down the fixture, for example, closes a network connection.
-	 * This method is called after a test is executed.
-	 *
-	 * @return void
-	 *
-	 * @see     PHPUnit_Framework_TestCase::tearDown()
-	 * @since   3.6
-	 */
-	protected function tearDown()
-	{
-		$_SERVER = $this->backupServer;
-		unset($this->backupServer);
-		unset($this->object);
-		parent::tearDown();
-	}
 }

From 6547e38578e1c64f22cc3180596579abed8d7019 Mon Sep 17 00:00:00 2001
From: Tomasz Narloch <csthomas@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:17:18 +0100
Subject: [PATCH 02/18] Mssql: Load class before call sqlsrv_fetch_object on
 windows platform (#14137)

---
 libraries/joomla/database/driver/sqlsrv.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/joomla/database/driver/sqlsrv.php b/libraries/joomla/database/driver/sqlsrv.php
index 74799db2dc861..0a3eba9a4bbce 100644
--- a/libraries/joomla/database/driver/sqlsrv.php
+++ b/libraries/joomla/database/driver/sqlsrv.php
@@ -968,6 +968,9 @@ protected function fetchAssoc($cursor = null)
 	 */
 	protected function fetchObject($cursor = null, $class = 'stdClass')
 	{
+		// Class has to be loaded for sqlsrv on windows platform
+		class_exists($class);
+
 		return sqlsrv_fetch_object($cursor ? $cursor : $this->cursor, $class);
 	}
 

From 58c90c81a2a5ec90abf349a5a19d0c6bb67227df Mon Sep 17 00:00:00 2001
From: Tomasz Narloch <csthomas@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:17:47 +0100
Subject: [PATCH 03/18] MSSQL Replace datetime to datetime2(0) type for all
 joomla columns. (#14123)

---
 .../sql/updates/sqlazure/3.7.0-2017-02-16.sql | 329 ++++++++++++++++++
 installation/sql/sqlazure/joomla.sql          | 154 ++++----
 2 files changed, 406 insertions(+), 77 deletions(-)
 create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-16.sql

diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-16.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-16.sql
new file mode 100644
index 0000000000000..2f49b7268f8d3
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-16.sql
@@ -0,0 +1,329 @@
+-- Replace datetime to datetime2(0) type for all columns.
+DROP INDEX [idx_track_date] ON [#__banner_tracks];
+ALTER TABLE [#__banner_tracks] DROP CONSTRAINT [PK_#__banner_tracks_track_date];
+ALTER TABLE [#__banner_tracks] ALTER COLUMN [track_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banner_tracks] ADD CONSTRAINT [PK_#__banner_tracks_track_date_type_id] PRIMARY KEY CLUSTERED
+(
+	[track_date] ASC,
+	[track_type] ASC,
+	[banner_id] ASC
+) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY];
+CREATE NONCLUSTERED INDEX [idx_track_date2] ON [#__banner_tracks]
+(
+	[track_date] ASC
+) WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE PROCEDURE "#removeDefault"
+(
+	@table NVARCHAR(100),
+	@column NVARCHAR(100)
+)
+AS
+BEGIN
+	DECLARE @constraintName AS nvarchar(100)
+	DECLARE @constraintQuery AS nvarchar(1000)
+	SELECT @constraintName = name FROM sys.default_constraints
+		WHERE parent_object_id = object_id(@table)
+		AND parent_column_id = columnproperty(object_id(@table), @column, 'ColumnId')
+	SET @constraintQuery = 'ALTER TABLE [' + @table + '] DROP CONSTRAINT [' + @constraintName + ']'
+	EXECUTE sp_executesql @constraintQuery
+END;
+
+EXECUTE "#removeDefault" "#__banner_clients", 'checked_out_time';
+ALTER TABLE [#__banner_clients] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banner_clients] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__banners", 'checked_out_time';
+ALTER TABLE [#__banners] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__banners", 'publish_up';
+ALTER TABLE [#__banners] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__banners", 'publish_down';
+ALTER TABLE [#__banners] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__banners", 'reset';
+ALTER TABLE [#__banners] ALTER COLUMN [reset] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [reset];
+
+EXECUTE "#removeDefault" "#__banners", 'created';
+ALTER TABLE [#__banners] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__banners", 'modified';
+ALTER TABLE [#__banners] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+DROP INDEX [idx_checked_out_time] ON [#__categories];
+EXECUTE "#removeDefault" "#__categories", 'checked_out_time';
+ALTER TABLE [#__categories] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__categories] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+CREATE NONCLUSTERED INDEX [idx_checked_out_time2] ON [#__categories](
+	[checked_out_time] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__categories", 'created_time';
+ALTER TABLE [#__categories] ALTER COLUMN [created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__categories] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_time];
+
+EXECUTE "#removeDefault" "#__categories", 'modified_time';
+ALTER TABLE [#__categories] ALTER COLUMN [modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__categories] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_time];
+
+EXECUTE "#removeDefault" "#__contact_details", 'checked_out_time';
+ALTER TABLE [#__contact_details] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__contact_details", 'created';
+ALTER TABLE [#__contact_details] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__contact_details", 'modified';
+ALTER TABLE [#__contact_details] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__contact_details", 'publish_up';
+ALTER TABLE [#__contact_details] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__contact_details", 'publish_down';
+ALTER TABLE [#__contact_details] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__content", 'created';
+ALTER TABLE [#__content] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__content", 'modified';
+ALTER TABLE [#__content] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__content", 'checked_out_time';
+ALTER TABLE [#__content] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__content", 'publish_up';
+ALTER TABLE [#__content] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__content", 'publish_down';
+ALTER TABLE [#__content] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+DROP INDEX [idx_date_id] ON [#__contentitem_tag_map];
+EXECUTE "#removeDefault" "#__contentitem_tag_map", 'tag_date';
+ALTER TABLE [#__contentitem_tag_map] ALTER COLUMN [tag_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contentitem_tag_map] ADD DEFAULT '1900-01-01 00:00:00' FOR [tag_date];
+CREATE NONCLUSTERED INDEX [idx_date_id2] ON [#__contentitem_tag_map](
+	[tag_date] ASC,
+	[tag_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__extensions", 'checked_out_time';
+ALTER TABLE [#__extensions] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__extensions] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__fields", 'checked_out_time';
+ALTER TABLE [#__fields] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__fields", 'created_time';
+ALTER TABLE [#__fields] ALTER COLUMN [created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_time];
+
+EXECUTE "#removeDefault" "#__fields", 'modified_time';
+ALTER TABLE [#__fields] ALTER COLUMN [modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_time];
+
+EXECUTE "#removeDefault" "#__fields_groups", 'checked_out_time';
+ALTER TABLE [#__fields_groups] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields_groups] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__fields_groups", 'created';
+ALTER TABLE [#__fields_groups] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields_groups] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__fields_groups", 'modified';
+ALTER TABLE [#__fields_groups] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields_groups] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__finder_filters", 'created';
+ALTER TABLE [#__finder_filters] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_filters] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__finder_filters", 'modified';
+ALTER TABLE [#__finder_filters] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_filters] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__finder_filters", 'checked_out_time';
+ALTER TABLE [#__finder_filters] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_filters] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__finder_links", 'indexdate';
+ALTER TABLE [#__finder_links] ALTER COLUMN [indexdate] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [indexdate];
+
+EXECUTE "#removeDefault" "#__finder_links", 'publish_start_date';
+ALTER TABLE [#__finder_links] ALTER COLUMN [publish_start_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_start_date];
+
+EXECUTE "#removeDefault" "#__finder_links", 'publish_end_date';
+ALTER TABLE [#__finder_links] ALTER COLUMN [publish_end_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_end_date];
+
+EXECUTE "#removeDefault" "#__finder_links", 'start_date';
+ALTER TABLE [#__finder_links] ALTER COLUMN [start_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [start_date];
+
+EXECUTE "#removeDefault" "#__finder_links", 'end_date';
+ALTER TABLE [#__finder_links] ALTER COLUMN [end_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [end_date];
+
+EXECUTE "#removeDefault" "#__menu", 'checked_out_time';
+ALTER TABLE [#__menu] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__menu] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__messages", 'date_time';
+ALTER TABLE [#__messages] ALTER COLUMN [date_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__messages] ADD DEFAULT '1900-01-01 00:00:00' FOR [date_time];
+
+EXECUTE "#removeDefault" "#__modules", 'checked_out_time';
+ALTER TABLE [#__modules] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__modules] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__modules", 'publish_up';
+ALTER TABLE [#__modules] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__modules] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__modules", 'publish_down';
+ALTER TABLE [#__modules] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__modules] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'checked_out_time';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'created';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'modified';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'publish_up';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'publish_down';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__redirect_links", 'created_date';
+ALTER TABLE [#__redirect_links] ALTER COLUMN [created_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__redirect_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_date];
+
+DROP INDEX [idx_link_modifed] ON [#__redirect_links];
+EXECUTE "#removeDefault" "#__redirect_links", 'modified_date';
+ALTER TABLE [#__redirect_links] ALTER COLUMN [modified_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__redirect_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_date];
+CREATE NONCLUSTERED INDEX [idx_link_modifed2] ON [#__redirect_links](
+	[modified_date] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__tags", 'checked_out_time';
+ALTER TABLE [#__tags] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__tags", 'created_time';
+ALTER TABLE [#__tags] ALTER COLUMN [created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_time];
+
+EXECUTE "#removeDefault" "#__tags", 'modified_time';
+ALTER TABLE [#__tags] ALTER COLUMN [modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_time];
+
+EXECUTE "#removeDefault" "#__tags", 'publish_up';
+ALTER TABLE [#__tags] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__tags", 'publish_down';
+ALTER TABLE [#__tags] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__ucm_content", 'core_checked_out_time';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_checked_out_time];
+
+DROP INDEX [idx_created_time] ON [#__ucm_content];
+EXECUTE "#removeDefault" "#__ucm_content", 'core_created_time';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_created_time];
+CREATE NONCLUSTERED INDEX [idx_created_time2] ON [#__ucm_content](
+	[core_created_time] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+DROP INDEX [idx_modified_time] ON [#__ucm_content];
+EXECUTE "#removeDefault" "#__ucm_content", 'core_modified_time';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_modified_time];
+CREATE NONCLUSTERED INDEX [idx_modified_time2] ON [#__ucm_content](
+	[core_modified_time] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__ucm_content", 'core_publish_up';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_publish_up];
+
+EXECUTE "#removeDefault" "#__ucm_content", 'core_publish_down';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_publish_down];
+
+DROP INDEX [idx_save_date] ON [#__ucm_history];
+EXECUTE "#removeDefault" "#__ucm_history", 'save_date';
+ALTER TABLE [#__ucm_history] ALTER COLUMN [save_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_history] ADD DEFAULT '1900-01-01 00:00:00' FOR [save_date];
+CREATE NONCLUSTERED INDEX [idx_save_date2] ON [#__ucm_history](
+	[save_date] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__user_notes", 'checked_out_time';
+ALTER TABLE [#__user_notes] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__user_notes", 'created_time';
+ALTER TABLE [#__user_notes] ALTER COLUMN [created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_time];
+
+EXECUTE "#removeDefault" "#__user_notes", 'modified_time';
+ALTER TABLE [#__user_notes] ALTER COLUMN [modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_time];
+
+EXECUTE "#removeDefault" "#__user_notes", 'review_time';
+ALTER TABLE [#__user_notes] ALTER COLUMN [review_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [review_time];
+
+EXECUTE "#removeDefault" "#__user_notes", 'publish_up';
+ALTER TABLE [#__user_notes] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__user_notes", 'publish_down';
+ALTER TABLE [#__user_notes] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__users", 'registerDate';
+ALTER TABLE [#__users] ALTER COLUMN [registerDate] [datetime2](0) NOT NULL;
+ALTER TABLE [#__users] ADD DEFAULT '1900-01-01 00:00:00' FOR [registerDate];
+
+EXECUTE "#removeDefault" "#__users", 'lastvisitDate';
+ALTER TABLE [#__users] ALTER COLUMN [lastvisitDate] [datetime2](0) NOT NULL;
+ALTER TABLE [#__users] ADD DEFAULT '1900-01-01 00:00:00' FOR [lastvisitDate];
+
+EXECUTE "#removeDefault" "#__users", 'lastResetTime';
+ALTER TABLE [#__users] ALTER COLUMN [lastResetTime] [datetime2](0) NOT NULL;
+ALTER TABLE [#__users] ADD DEFAULT '1900-01-01 00:00:00' FOR [lastResetTime];
+
+DROP PROCEDURE "#removeDefault";
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index 51ff4f4666792..d3ea37d47c18a 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -165,7 +165,7 @@ CREATE TABLE [#__banner_clients](
 	[extrainfo] [nvarchar](max) NOT NULL,
 	[state] [smallint] NOT NULL DEFAULT 0,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[metakey] [nvarchar](max) NOT NULL DEFAULT 0,
 	[own_prefix] [smallint] NOT NULL DEFAULT 0,
 	[metakey_prefix] [nvarchar](255) NOT NULL DEFAULT '',
@@ -192,11 +192,11 @@ CREATE NONCLUSTERED INDEX [idx_own_prefix] ON [#__banner_clients]
 SET QUOTED_IDENTIFIER ON;
 
 CREATE TABLE [#__banner_tracks](
-	[track_date] [datetime] NOT NULL,
+	[track_date] [datetime2](0) NOT NULL,
 	[track_type] [bigint] NOT NULL,
 	[banner_id] [bigint] NOT NULL,
 	[count] [bigint] NOT NULL DEFAULT 0,
- CONSTRAINT [PK_#__banner_tracks_track_date] PRIMARY KEY CLUSTERED
+ CONSTRAINT [PK_#__banner_tracks_track_date_type_id] PRIMARY KEY CLUSTERED
 (
 	[track_date] ASC,
 	[track_type] ASC,
@@ -209,7 +209,7 @@ CREATE NONCLUSTERED INDEX [idx_banner_id] ON [#__banner_tracks]
 	[banner_id] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
-CREATE NONCLUSTERED INDEX [idx_track_date] ON [#__banner_tracks]
+CREATE NONCLUSTERED INDEX [idx_track_date2] ON [#__banner_tracks]
 (
 	[track_date] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
@@ -246,15 +246,15 @@ CREATE TABLE [#__banners](
 	[track_clicks] [smallint] NOT NULL DEFAULT -1,
 	[track_impressions] [smallint] NOT NULL DEFAULT -1,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[reset] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[created] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[reset] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[created] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[language] [nvarchar](7) NOT NULL DEFAULT '',
 	[created_by] [bigint] NOT NULL DEFAULT 0,
 	[created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
-	[modified] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_by] [bigint] NOT NULL DEFAULT 0,
 	[version] [bigint] NOT NULL DEFAULT 1,
  CONSTRAINT [PK_#__banners_id] PRIMARY KEY CLUSTERED
@@ -311,16 +311,16 @@ CREATE TABLE [#__categories](
 	[description] [nvarchar](max) NOT NULL DEFAULT '',
 	[published] [smallint] NOT NULL DEFAULT 0,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[access] [int] NOT NULL DEFAULT 0,
 	[params] [nvarchar](max) NOT NULL DEFAULT '',
 	[metadesc] [nvarchar](1024) NOT NULL DEFAULT '',
 	[metakey] [nvarchar](1024) NOT NULL DEFAULT '',
 	[metadata] [nvarchar](2048) NOT NULL DEFAULT '',
 	[created_user_id] [bigint] NOT NULL DEFAULT 0,
-	[created_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_user_id] [bigint] NOT NULL DEFAULT 0,
-	[modified_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[hits] [bigint] NOT NULL DEFAULT 0,
 	[language] [nvarchar](7) NOT NULL DEFAULT '',
 	[version] [bigint] NOT NULL DEFAULT 1,
@@ -373,7 +373,7 @@ CREATE NONCLUSTERED INDEX [idx_created_user_id] ON [#__categories]
 	[created_user_id] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
-CREATE NONCLUSTERED INDEX [idx_checked_out_time] ON [#__categories]
+CREATE NONCLUSTERED INDEX [idx_checked_out_time2] ON [#__categories]
 (
 	[checked_out_time] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
@@ -421,7 +421,7 @@ CREATE TABLE [#__contact_details](
 	[default_con] [tinyint] NOT NULL DEFAULT 0,
 	[published] [smallint] NOT NULL,
 	[checked_out] [int] NOT NULL,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[ordering] [int] NOT NULL DEFAULT 0,
 	[params] [nvarchar](max) NOT NULL,
 	[user_id] [int] NOT NULL DEFAULT 0,
@@ -433,18 +433,18 @@ CREATE TABLE [#__contact_details](
 	[sortname2] [nvarchar](255) NOT NULL,
 	[sortname3] [nvarchar](255) NOT NULL,
 	[language] [nvarchar](7) NOT NULL,
-	[created] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[created_by] [bigint] NOT NULL DEFAULT 0,
 	[created_by_alias] [nvarchar](255) NOT NULL,
-	[modified] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_by] [bigint] NOT NULL DEFAULT 0,
 	[metakey] [nvarchar](max) NOT NULL,
 	[metadesc] [nvarchar](max) NOT NULL,
 	[metadata] [nvarchar](max) NOT NULL,
 	[featured] [tinyint] NOT NULL DEFAULT 0,
 	[xreference] [nvarchar](50) NOT NULL,
-	[publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[version] [bigint] NOT NULL DEFAULT 1,
 	[hits] [bigint] NOT NULL DEFAULT 0,
  CONSTRAINT [PK_#__contact_details_id] PRIMARY KEY CLUSTERED
@@ -506,15 +506,15 @@ CREATE TABLE [#__content](
 	[fulltext] [nvarchar](max) NOT NULL,
 	[state] [smallint] NOT NULL DEFAULT 0,
 	[catid] [bigint] NOT NULL DEFAULT 0,
-	[created] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[created_by] [bigint] NOT NULL DEFAULT 0,
 	[created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
-	[modified] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_by] [bigint] NOT NULL DEFAULT 0,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[images] [nvarchar](max) NOT NULL,
 	[urls] [nvarchar](max) NOT NULL,
 	[attribs] [nvarchar](max) NOT NULL,
@@ -663,7 +663,7 @@ CREATE TABLE [#__contentitem_tag_map](
 	[core_content_id] [bigint] NOT NULL,
 	[content_item_id] [int] NOT NULL,
 	[tag_id] [bigint] NOT NULL,
-	[tag_date] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[tag_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[type_id] [int] NOT NULL,
  CONSTRAINT [#__contentitem_tag_map$uc_ItemnameTagid] UNIQUE NONCLUSTERED
 (
@@ -673,7 +673,7 @@ CREATE TABLE [#__contentitem_tag_map](
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY];
 
-CREATE NONCLUSTERED INDEX [idx_date_id] ON [#__contentitem_tag_map]
+CREATE NONCLUSTERED INDEX [idx_date_id2] ON [#__contentitem_tag_map]
 (
 	[tag_date] ASC,
 	[tag_id] ASC
@@ -711,7 +711,7 @@ CREATE TABLE [#__extensions](
 	[custom_data] [nvarchar](max) NOT NULL,
 	[system_data] [nvarchar](max) NOT NULL DEFAULT '',
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[ordering] [int] NULL DEFAULT 0,
 	[state] [int] NULL DEFAULT 0,
  CONSTRAINT [PK_#__extensions_extension_id] PRIMARY KEY CLUSTERED
@@ -1105,14 +1105,14 @@ CREATE TABLE [#__fields] (
 	[state] [smallint] NOT NULL DEFAULT 0,
 	[required] [smallint] NOT NULL DEFAULT 0,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[ordering] [int] NOT NULL DEFAULT 0,
 	[params] [nvarchar](max) NOT NULL DEFAULT '',
 	[fieldparams] [nvarchar](max) NOT NULL DEFAULT '',
 	[language] [nvarchar](7) NOT NULL DEFAULT '',
-	[created_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[created_user_id] [bigint] NOT NULL DEFAULT 0,
-	[modified_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_by] [bigint] NOT NULL DEFAULT 0,
 	[access] [int] NOT NULL DEFAULT 1,
 CONSTRAINT [PK_#__fields_id] PRIMARY KEY CLUSTERED(
@@ -1166,12 +1166,12 @@ CREATE TABLE [#__fields_groups] (
 	[description] [nvarchar](max) NOT NULL DEFAULT '',
 	[state] [smallint] NOT NULL DEFAULT 0,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[ordering] [int] NOT NULL DEFAULT 0,
 	[language] [nvarchar](7) NOT NULL DEFAULT '',
-	[created] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[created_by] [bigint] NOT NULL DEFAULT 0,
-	[modified] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_by] [bigint] NOT NULL DEFAULT 0,
 	[access] [int] NOT NULL DEFAULT 1,
 CONSTRAINT [PK_#__fields_groups_id] PRIMARY KEY CLUSTERED(
@@ -1234,13 +1234,13 @@ CREATE TABLE [#__finder_filters](
 	[title] [nvarchar](255) NOT NULL,
 	[alias] [nvarchar](255) NOT NULL,
 	[state] [smallint] NOT NULL DEFAULT 1,
-	[created] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[created_by] [bigint] NOT NULL,
 	[created_by_alias] [nvarchar](255) NOT NULL,
-	[modified] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_by] [bigint] NOT NULL DEFAULT 0,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[map_count] [bigint] NOT NULL DEFAULT 0,
 	[data] [nvarchar](max) NOT NULL,
 	[params] [nvarchar](max) NULL,
@@ -1260,16 +1260,16 @@ CREATE TABLE [#__finder_links](
 	[route] [nvarchar](255) NOT NULL,
 	[title] [nvarchar](255) NULL,
 	[description] [nvarchar](max) NULL,
-	[indexdate] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[indexdate] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[md5sum] [nvarchar](32) NULL,
 	[published] [smallint] NOT NULL DEFAULT 1,
 	[state] [int] NULL DEFAULT 1,
 	[access] [int] NULL DEFAULT 0,
 	[language] [nvarchar](8) NOT NULL,
-	[publish_start_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_end_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[start_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[end_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[publish_start_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_end_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[start_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[end_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[list_price] [float] NOT NULL DEFAULT 0,
 	[sale_price] [float] NOT NULL DEFAULT 0,
 	[type_id] [int] NOT NULL,
@@ -2219,7 +2219,7 @@ CREATE TABLE [#__menu](
 	[level] [bigint] NOT NULL DEFAULT 0,
 	[component_id] [bigint] NOT NULL DEFAULT 0,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[browserNav] [smallint] NOT NULL DEFAULT 0,
 	[access] [int] NOT NULL DEFAULT 0,
 	[img] [nvarchar](255) NOT NULL,
@@ -2375,7 +2375,7 @@ CREATE TABLE [#__messages](
 	[user_id_from] [bigint] NOT NULL DEFAULT 0,
 	[user_id_to] [bigint] NOT NULL DEFAULT 0,
 	[folder_id] [tinyint] NOT NULL DEFAULT 0,
-	[date_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[date_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[state] [smallint] NOT NULL DEFAULT 0,
 	[priority] [tinyint] NOT NULL,
 	[subject] [nvarchar](255) NOT NULL DEFAULT '',
@@ -2418,9 +2418,9 @@ CREATE TABLE [#__modules](
 	[ordering] [int] NOT NULL DEFAULT 0,
 	[position] [nvarchar](50) NULL DEFAULT '',
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[published] [smallint] NOT NULL DEFAULT 0,
 	[module] [nvarchar](50) NULL,
 	[access] [bigint] NOT NULL DEFAULT 0,
@@ -2547,23 +2547,23 @@ CREATE TABLE [#__newsfeeds](
 	[numarticles] [bigint] NOT NULL DEFAULT 1,
 	[cache_time] [bigint] NOT NULL DEFAULT 3600,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[ordering] [int] NOT NULL DEFAULT 0,
 	[rtl] [smallint] NOT NULL DEFAULT 0,
 	[access] [bigint] NOT NULL DEFAULT 0,
 	[language] [nvarchar](7) NOT NULL,
 	[params] [nvarchar](max) NOT NULL,
-	[created] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[created_by] [bigint] NOT NULL DEFAULT 0,
 	[created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
-	[modified] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_by] [bigint] NOT NULL DEFAULT 0,
 	[metakey] [nvarchar](max) NOT NULL,
 	[metadesc] [nvarchar](max) NOT NULL,
 	[metadata] [nvarchar](max) NOT NULL,
 	[xreference] [nvarchar](50) NOT NULL,
-	[publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[description] [nvarchar](max) NOT NULL,
 	[version] [bigint] NOT NULL DEFAULT 1,
 	[hits] [bigint] NOT NULL DEFAULT 0,
@@ -2668,8 +2668,8 @@ CREATE TABLE [#__redirect_links](
 	[comment] [nvarchar](255) NOT NULL,
 	[hits] [bigint] NOT NULL DEFAULT 0,
 	[published] [smallint] NOT NULL,
-	[created_date] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[modified_date] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[modified_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[header] [smallint] NOT NULL DEFAULT 301,
  CONSTRAINT [PK_#__redirect_links_id] PRIMARY KEY CLUSTERED
 (
@@ -2682,7 +2682,7 @@ CREATE NONCLUSTERED INDEX [idx_old_url] ON [#__redirect_links]
 	[old_url] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
-CREATE NONCLUSTERED INDEX [idx_link_modifed] ON [#__redirect_links]
+CREATE NONCLUSTERED INDEX [idx_link_modifed2] ON [#__redirect_links]
 (
 	[modified_date] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
@@ -2743,24 +2743,24 @@ CREATE TABLE [#__tags](
 	[description] [nvarchar](max) NOT NULL,
 	[published] [smallint] NOT NULL DEFAULT 0,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[access] [bigint] NOT NULL DEFAULT 0,
 	[params] [nvarchar](max) NOT NULL,
 	[metadesc] [nvarchar](1024) NOT NULL,
 	[metakey] [nvarchar](1024) NOT NULL,
 	[metadata] [nvarchar](2048) NOT NULL,
 	[created_user_id] [bigint] NOT NULL DEFAULT 0,
-	[created_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
 	[modified_user_id] [bigint] NOT NULL DEFAULT 0,
-	[modified_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[images] [nvarchar](max) NOT NULL,
 	[urls] [nvarchar](max) NOT NULL,
 	[hits] [bigint] NOT NULL DEFAULT 0,
 	[language] [nvarchar](7) NOT NULL,
 	[version] [bigint] NOT NULL DEFAULT 1,
-	[publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
  CONSTRAINT [PK_#__tags_id] PRIMARY KEY CLUSTERED
 (
 	[id] ASC
@@ -2889,7 +2889,7 @@ CREATE TABLE [#__ucm_content](
 	[core_alias] [nvarchar](255) NOT NULL DEFAULT '',
 	[core_body] [nvarchar](max) NOT NULL DEFAULT '',
 	[core_state] [smallint] NOT NULL DEFAULT 0,
-	[core_checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[core_checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[core_checked_out_user_id] [bigint] NOT NULL DEFAULT 0,
 	[core_access] [bigint] NOT NULL DEFAULT 0,
 	[core_params] [nvarchar](max) NOT NULL DEFAULT '',
@@ -2897,12 +2897,12 @@ CREATE TABLE [#__ucm_content](
 	[core_metadata] [nvarchar](2048) NOT NULL DEFAULT '',
 	[core_created_user_id] [bigint] NOT NULL DEFAULT 0,
 	[core_created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
-	[core_created_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[core_created_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[core_modified_user_id] [bigint] NOT NULL DEFAULT 0,
-	[core_modified_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[core_modified_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[core_language] [nvarchar](7) NOT NULL DEFAULT '',
-	[core_publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[core_publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[core_publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[core_publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[core_content_item_id] [bigint] NOT NULL DEFAULT 0,
 	[asset_id] [bigint] NOT NULL DEFAULT 0,
 	[core_images] [nvarchar](max) NOT NULL DEFAULT '',
@@ -2952,12 +2952,12 @@ CREATE NONCLUSTERED INDEX [idx_title] ON [#__ucm_content]
 	[core_title] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
-CREATE NONCLUSTERED INDEX [idx_modified_time] ON [#__ucm_content]
+CREATE NONCLUSTERED INDEX [idx_modified_time2] ON [#__ucm_content]
 (
 	[core_modified_time] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
-CREATE NONCLUSTERED INDEX [idx_created_time] ON [#__ucm_content]
+CREATE NONCLUSTERED INDEX [idx_created_time2] ON [#__ucm_content]
 (
 	[core_created_time] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
@@ -2995,7 +2995,7 @@ CREATE TABLE [#__ucm_history](
 	[ucm_item_id] [bigint] NOT NULL,
 	[ucm_type_id] [bigint] NOT NULL,
 	[version_note] [nvarchar](255) NOT NULL DEFAULT '',
-	[save_date] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[save_date] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[editor_user_id] [bigint] NOT NULL DEFAULT 0,
 	[character_count] [bigint] NOT NULL DEFAULT 0,
 	[sha1_hash] [nvarchar](50) NOT NULL DEFAULT '',
@@ -3013,7 +3013,7 @@ CREATE NONCLUSTERED INDEX [idx_ucm_item_id] ON [#__ucm_history]
 	[ucm_item_id] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
-CREATE NONCLUSTERED INDEX [idx_save_date] ON [#__ucm_history]
+CREATE NONCLUSTERED INDEX [idx_save_date2] ON [#__ucm_history]
 (
 	[save_date] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
@@ -3135,14 +3135,14 @@ CREATE TABLE [#__user_notes](
 	[body] [nvarchar](max) NOT NULL,
 	[state] [smallint] NOT NULL DEFAULT 0,
 	[checked_out] [bigint] NOT NULL DEFAULT 0,
-	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[created_user_id] [bigint] NOT NULL,
-	[created_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_user_id] [bigint] NOT NULL,
-	[modified_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[review_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[review_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
  CONSTRAINT [PK_#__user_notes_id] PRIMARY KEY CLUSTERED
 (
 	[id] ASC
@@ -3257,11 +3257,11 @@ CREATE TABLE [#__users](
 	[password] [nvarchar](100) NOT NULL DEFAULT '',
 	[block] [smallint] NOT NULL DEFAULT 0,
 	[sendEmail] [smallint] NULL DEFAULT 0,
-	[registerDate] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
-	[lastvisitDate] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[registerDate] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[lastvisitDate] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[activation] [nvarchar](100) NOT NULL DEFAULT '',
 	[params] [nvarchar](max) NOT NULL,
-	[lastResetTime] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[lastResetTime] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[resetCount] [int] NOT NULL DEFAULT 0,
 	[otpKey] [nvarchar](1000) NOT NULL DEFAULT '',
 	[otep] [nvarchar](1000) NOT NULL DEFAULT '',

From 2b5626fe83c76ae2286212547fba8f13e3893aa7 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:26:06 +0100
Subject: [PATCH 04/18] lets use the correct class for radio buttons (#14119)

---
 administrator/components/com_menus/models/forms/menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_menus/models/forms/menu.xml b/administrator/components/com_menus/models/forms/menu.xml
index 4f1855a388fd1..155cbe6071908 100644
--- a/administrator/components/com_menus/models/forms/menu.xml
+++ b/administrator/components/com_menus/models/forms/menu.xml
@@ -50,7 +50,7 @@
 			label="COM_MENUS_MENU_CLIENT_ID_LABEL"
 			description="COM_MENUS_MENU_CLIENT_ID_DESC"
 			default="0"
-			class="btn-group"
+			class="btn-group btn-group-yesno btn-group-reversed"
 			required="true"
 		>
 			<option value="0">JSITE</option>

From 29a6adeac8d5bc41f31096a6ea404116498be6e8 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:26:53 +0100
Subject: [PATCH 05/18] alpha order the language strings com_plugins (#14121)

---
 administrator/language/en-GB/en-GB.com_plugins.sys.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_plugins.sys.ini b/administrator/language/en-GB/en-GB.com_plugins.sys.ini
index 33ab25e666c95..3a5cabc27173b 100644
--- a/administrator/language/en-GB/en-GB.com_plugins.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_plugins.sys.ini
@@ -4,7 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_PLUGINS="Plugins"
-COM_PLUGINS_XML_DESCRIPTION="This component manages Joomla plugins."
-
 COM_PLUGINS_PLUGINS_VIEW_DEFAULT_DESC="Shows a list of plugins to manage"
 COM_PLUGINS_PLUGINS_VIEW_DEFAULT_TITLE="Plugin Manager"
+COM_PLUGINS_XML_DESCRIPTION="This component manages Joomla plugins."

From 21006b0accdaa2fa31406ea4a87752e9bfd35d3a Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:27:17 +0100
Subject: [PATCH 06/18] aplha order the language strings (com_postinstall)
 (#14122)

---
 administrator/language/en-GB/en-GB.com_postinstall.sys.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
index f501b45a672ee..77f7d43a60240 100644
--- a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
@@ -4,7 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_POSTINSTALL="Post-installation Messages"
-COM_POSTINSTALL_XML_DESCRIPTION="Displays post-installation and post-upgrade messages for Joomla! and its extensions."
-
 COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_DESC="Displays post-installation and post-upgrade messages for Joomla! and its extensions."
 COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_TITLE="Post-Installation Messages"
+COM_POSTINSTALL_XML_DESCRIPTION="Displays post-installation and post-upgrade messages for Joomla! and its extensions."

From 06909f983b726359688b9ea777425640d4eaab1f Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:28:03 +0100
Subject: [PATCH 07/18] alpha order language strings com_tempaltes (#14124)

---
 administrator/language/en-GB/en-GB.com_templates.sys.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_templates.sys.ini b/administrator/language/en-GB/en-GB.com_templates.sys.ini
index 35f7d8e34dc98..f1eb659885422 100644
--- a/administrator/language/en-GB/en-GB.com_templates.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.sys.ini
@@ -4,9 +4,8 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_TEMPLATES="Templates"
-COM_TEMPLATES_XML_DESCRIPTION="This component manages templates."
-
 COM_TEMPLATES_STYLE_VIEW_DEFAULT_DESC="Shows a List of Template styles"
 COM_TEMPLATES_STYLE_VIEW_DEFAULT_TITLE="Template Styles"
 COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_DESC="Shows a List of Installed Templates"
 COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_TITLE="Templates"
+COM_TEMPLATES_XML_DESCRIPTION="This component manages templates."

From a0482db4c8c491e1a79af26fd7e37f7317996015 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:28:27 +0100
Subject: [PATCH 08/18] alpha order langauge strings com_users (#14125)

---
 administrator/language/en-GB/en-GB.com_users.sys.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_users.sys.ini b/administrator/language/en-GB/en-GB.com_users.sys.ini
index 7797cece1a16a..314a386ec666c 100644
--- a/administrator/language/en-GB/en-GB.com_users.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_users.sys.ini
@@ -4,8 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_USERS="Users"
-COM_USERS_XML_DESCRIPTION="Component for managing users."
-
 COM_USERS_CONTENT_TYPE_CATEGORY="User Notes Category"
 COM_USERS_CONTENT_TYPE_NOTE="User Notes"
 COM_USERS_CONTENT_TYPE_USER="User"
@@ -49,3 +47,4 @@ COM_USER_REMIND_VIEW_DEFAULT_TITLE="Username Reminder Request"
 COM_USER_RESET_VIEW_DEFAULT_DESC="Displays a request to reset password."
 COM_USER_RESET_VIEW_DEFAULT_OPTION="Default"
 COM_USER_RESET_VIEW_DEFAULT_TITLE="Password Reset"
+COM_USERS_XML_DESCRIPTION="Component for managing users."

From 556391f3197d82343cbea29060a3993322807260 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:29:07 +0100
Subject: [PATCH 09/18] alpha order com_users.ini (#14126)

* alpha order com_users.ini

* thnaks @infograf768
---
 .../language/en-GB/en-GB.com_users.ini        | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
index 942f04c24ac02..5828fa4f966b9 100644
--- a/administrator/language/en-GB/en-GB.com_users.ini
+++ b/administrator/language/en-GB/en-GB.com_users.ini
@@ -3,19 +3,6 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category"
-COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category"
-COM_USERS_OPTION_FILTER_DATE="- Select Registration Date -"
-COM_USERS_OPTION_FILTER_LAST_VISIT_DATE="- Select Last Visit Date -"
-COM_USERS_OPTION_RANGE_NEVER="never"
-COM_USERS_OPTION_RANGE_PAST_1MONTH="in the last month"
-COM_USERS_OPTION_RANGE_PAST_3MONTH="in the last 3 months"
-COM_USERS_OPTION_RANGE_PAST_6MONTH="in the last 6 months"
-COM_USERS_OPTION_RANGE_PAST_WEEK="in the last week"
-COM_USERS_OPTION_RANGE_PAST_YEAR="in the last year"
-COM_USERS_OPTION_RANGE_POST_YEAR="more than a year ago"
-COM_USERS_OPTION_RANGE_TODAY="today"
-
 COM_USERS="Users"
 COM_USERS_ACTIONS_AVAILABLE="Actions Permitted"
 COM_USERS_ACTIVATED="Activated"
@@ -266,6 +253,16 @@ COM_USERS_NOTES_N_ITEMS_TRASHED="%d User Notes successfully trashed."
 COM_USERS_NOTES_N_ITEMS_TRASHED_1="%d User Note successfully trashed."
 COM_USERS_NOTES_N_ITEMS_UNPUBLISHED="%d User Notes successfully unpublished."
 COM_USERS_NOTES_N_ITEMS_UNPUBLISHED_1="%d User Note successfully unpublished."
+COM_USERS_OPTION_FILTER_DATE="- Select Registration Date -"
+COM_USERS_OPTION_FILTER_LAST_VISIT_DATE="- Select Last Visit Date -"
+COM_USERS_OPTION_RANGE_NEVER="never"
+COM_USERS_OPTION_RANGE_PAST_1MONTH="in the last month"
+COM_USERS_OPTION_RANGE_PAST_3MONTH="in the last 3 months"
+COM_USERS_OPTION_RANGE_PAST_6MONTH="in the last 6 months"
+COM_USERS_OPTION_RANGE_PAST_WEEK="in the last week"
+COM_USERS_OPTION_RANGE_PAST_YEAR="in the last year"
+COM_USERS_OPTION_RANGE_POST_YEAR="more than a year ago"
+COM_USERS_OPTION_RANGE_TODAY="today"
 COM_USERS_OPTION_LEVEL_CATEGORY="%d (top category)"
 COM_USERS_OPTION_LEVEL_COMPONENT="%d (component)"
 COM_USERS_OPTION_LEVEL_DEEPER="%d (deeper)"
@@ -373,7 +370,9 @@ COM_USERS_VIEW_NOTES_TITLE="User Notes"
 COM_USERS_VIEW_USERS_TITLE="Users"
 COM_USERS_XML_DESCRIPTION="Component for managing users"
 JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."
-
+; Categories overrides
+COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category"
+COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category"
 ; Fields overrides
 COM_USERS_USER_CATEGORIES_TITLE="Users: Field Groups"
 COM_USERS_USER_CATEGORY_ADD_TITLE="Users: New Field Group"

From 2428786dd06c5a4deff34e0dc1a4501b286c77ae Mon Sep 17 00:00:00 2001
From: Tomasz Narloch <csthomas@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:52:06 +0100
Subject: [PATCH 10/18] Sync columns in contact_details table, add missing
 defaults, clean up (#14113)

* Add missing defaults in contact_details table for sqlsrv

* Sync contact_details table accross all databases, add default
---
 .../sql/updates/mysql/3.7.0-2017-02-17.sql    |  8 +++
 .../updates/postgresql/3.7.0-2017-02-17.sql   |  8 +++
 .../sql/updates/sqlazure/3.7.0-2017-02-17.sql | 21 ++++++
 installation/sql/mysql/joomla.sql             | 32 ++++-----
 installation/sql/postgresql/joomla.sql        | 72 +++++++++----------
 installation/sql/sqlazure/joomla.sql          | 38 +++++-----
 6 files changed, 108 insertions(+), 71 deletions(-)
 create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-17.sql
 create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-17.sql
 create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-17.sql

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-17.sql b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-17.sql
new file mode 100644
index 0000000000000..9ff8df9851305
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-17.sql
@@ -0,0 +1,8 @@
+-- Normalize contact_details table default values.
+ALTER TABLE `#__contact_details` MODIFY `name` varchar(255) NOT NULL;
+ALTER TABLE `#__contact_details` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL;
+ALTER TABLE `#__contact_details` MODIFY `sortname1` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__contact_details` MODIFY `sortname2` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__contact_details` MODIFY `sortname3` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__contact_details` MODIFY `language` varchar(7) NOT NULL;
+ALTER TABLE `#__contact_details` MODIFY `xreference` varchar(50) NOT NULL DEFAULT '' COMMENT 'A reference to enable linkages to external data sets.';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-17.sql b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-17.sql
new file mode 100644
index 0000000000000..d3542a8193bce
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-17.sql
@@ -0,0 +1,8 @@
+-- Normalize contact_details table default values.
+ALTER TABLE "#__contact_details" ALTER COLUMN "name" DROP DEFAULT;
+ALTER TABLE "#__contact_details" ALTER COLUMN "alias" DROP DEFAULT;
+ALTER TABLE "#__contact_details" ALTER COLUMN "sortname1" SET DEFAULT '';
+ALTER TABLE "#__contact_details" ALTER COLUMN "sortname2" SET DEFAULT '';
+ALTER TABLE "#__contact_details" ALTER COLUMN "sortname3" SET DEFAULT '';
+ALTER TABLE "#__contact_details" ALTER COLUMN "language" DROP DEFAULT;
+ALTER TABLE "#__contact_details" ALTER COLUMN "xreference" SET DEFAULT '';
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-17.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-17.sql
new file mode 100644
index 0000000000000..aaf6bf4a20f08
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-17.sql
@@ -0,0 +1,21 @@
+-- Normalize contact_details table default values.
+DECLARE @table AS nvarchar(32)
+DECLARE @constraintName AS nvarchar(100)
+DECLARE @constraintQuery AS nvarchar(1000)
+SET QUOTED_IDENTIFIER OFF
+SET @table = "#__contact_details"
+SET QUOTED_IDENTIFIER ON
+SELECT @constraintName = name FROM sys.default_constraints
+WHERE parent_object_id = object_id(@table)
+AND parent_column_id = columnproperty(object_id(@table), 'name', 'ColumnId')
+SET @constraintQuery = 'ALTER TABLE [' + @table + '] DROP CONSTRAINT [' + @constraintName + ']'
+EXECUTE sp_executesql @constraintQuery;
+
+ALTER TABLE [#__contact_details] ADD DEFAULT (0) FOR [published];
+ALTER TABLE [#__contact_details] ADD DEFAULT (0) FOR [checked_out];
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [created_by_alias];
+
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [sortname1];
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [sortname2];
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [sortname3];
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [xreference];
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index dd59283e324c2..9c08f1e3b6a01 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -254,19 +254,19 @@ INSERT INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `level
 
 CREATE TABLE IF NOT EXISTS `#__contact_details` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL DEFAULT '',
-  `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
-  `con_position` varchar(255) DEFAULT NULL,
+  `name` varchar(255) NOT NULL,
+  `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `con_position` varchar(255),
   `address` text,
-  `suburb` varchar(100) DEFAULT NULL,
-  `state` varchar(100) DEFAULT NULL,
-  `country` varchar(100) DEFAULT NULL,
-  `postcode` varchar(100) DEFAULT NULL,
-  `telephone` varchar(255) DEFAULT NULL,
-  `fax` varchar(255) DEFAULT NULL,
+  `suburb` varchar(100),
+  `state` varchar(100),
+  `country` varchar(100),
+  `postcode` varchar(100),
+  `telephone` varchar(255),
+  `fax` varchar(255),
   `misc` mediumtext,
-  `image` varchar(255) DEFAULT NULL,
-  `email_to` varchar(255) DEFAULT NULL,
+  `image` varchar(255),
+  `email_to` varchar(255),
   `default_con` tinyint(1) unsigned NOT NULL DEFAULT 0,
   `published` tinyint(1) NOT NULL DEFAULT 0,
   `checked_out` int(10) unsigned NOT NULL DEFAULT 0,
@@ -278,10 +278,10 @@ CREATE TABLE IF NOT EXISTS `#__contact_details` (
   `access` int(10) unsigned NOT NULL DEFAULT 0,
   `mobile` varchar(255) NOT NULL DEFAULT '',
   `webpage` varchar(255) NOT NULL DEFAULT '',
-  `sortname1` varchar(255) NOT NULL,
-  `sortname2` varchar(255) NOT NULL,
-  `sortname3` varchar(255) NOT NULL,
-  `language` char(7) NOT NULL,
+  `sortname1` varchar(255) NOT NULL DEFAULT '',
+  `sortname2` varchar(255) NOT NULL DEFAULT '',
+  `sortname3` varchar(255) NOT NULL DEFAULT '',
+  `language` varchar(7) NOT NULL,
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `created_by` int(10) unsigned NOT NULL DEFAULT 0,
   `created_by_alias` varchar(255) NOT NULL DEFAULT '',
@@ -291,7 +291,7 @@ CREATE TABLE IF NOT EXISTS `#__contact_details` (
   `metadesc` text NOT NULL,
   `metadata` text NOT NULL,
   `featured` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Set if contact is featured.',
-  `xreference` varchar(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.',
+  `xreference` varchar(50) NOT NULL DEFAULT '' COMMENT 'A reference to enable linkages to external data sets.',
   `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `version` int(10) unsigned NOT NULL DEFAULT 1,
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 8e9be6a9e1619..0d4c3baae1b17 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -246,48 +246,48 @@ SELECT setval('#__categories_id_seq', 8, false);
 --
 CREATE TABLE "#__contact_details" (
   "id" serial NOT NULL,
-  "name" varchar(255) DEFAULT '' NOT NULL,
-  "alias" varchar(255) DEFAULT '' NOT NULL,
-  "con_position" varchar(255) DEFAULT NULL,
+  "name" varchar(255) NOT NULL,
+  "alias" varchar(255) NOT NULL,
+  "con_position" varchar(255),
   "address" text,
-  "suburb" varchar(100) DEFAULT NULL,
-  "state" varchar(100) DEFAULT NULL,
-  "country" varchar(100) DEFAULT NULL,
-  "postcode" varchar(100) DEFAULT NULL,
-  "telephone" varchar(255) DEFAULT NULL,
-  "fax" varchar(255) DEFAULT NULL,
+  "suburb" varchar(100),
+  "state" varchar(100),
+  "country" varchar(100),
+  "postcode" varchar(100),
+  "telephone" varchar(255),
+  "fax" varchar(255),
   "misc" text,
-  "image" varchar(255) DEFAULT NULL,
-  "email_to" varchar(255) DEFAULT NULL,
-  "default_con" smallint DEFAULT 0 NOT NULL,
-  "published" smallint DEFAULT 0 NOT NULL,
-  "checked_out" bigint DEFAULT 0 NOT NULL,
-  "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
-  "ordering" bigint DEFAULT 0 NOT NULL,
+  "image" varchar(255),
+  "email_to" varchar(255),
+  "default_con" smallint NOT NULL DEFAULT 0,
+  "published" smallint NOT NULL DEFAULT 0,
+  "checked_out" bigint NOT NULL DEFAULT 0,
+  "checked_out_time" timestamp without time zone NOT NULL DEFAULT '1970-01-01 00:00:00',
+  "ordering" bigint NOT NULL DEFAULT 0,
   "params" text NOT NULL,
-  "user_id" bigint DEFAULT 0 NOT NULL,
-  "catid" bigint DEFAULT 0 NOT NULL,
-  "access" bigint DEFAULT 0 NOT NULL,
-  "mobile" varchar(255) DEFAULT '' NOT NULL,
-  "webpage" varchar(255) DEFAULT '' NOT NULL,
-  "sortname1" varchar(255) NOT NULL,
-  "sortname2" varchar(255) NOT NULL,
-  "sortname3" varchar(255) NOT NULL,
-  "language" varchar(7) DEFAULT '' NOT NULL,
-  "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
-  "created_by" integer DEFAULT 0 NOT NULL,
-  "created_by_alias" varchar(255) DEFAULT '' NOT NULL,
-  "modified" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
-  "modified_by" integer DEFAULT 0 NOT NULL,
+  "user_id" bigint NOT NULL DEFAULT 0,
+  "catid" bigint NOT NULL DEFAULT 0,
+  "access" bigint NOT NULL DEFAULT 0,
+  "mobile" varchar(255) NOT NULL DEFAULT '',
+  "webpage" varchar(255) NOT NULL DEFAULT '',
+  "sortname1" varchar(255) NOT NULL DEFAULT '',
+  "sortname2" varchar(255) NOT NULL DEFAULT '',
+  "sortname3" varchar(255) NOT NULL DEFAULT '',
+  "language" varchar(7) NOT NULL,
+  "created" timestamp without time zone NOT NULL DEFAULT '1970-01-01 00:00:00',
+  "created_by" integer NOT NULL DEFAULT 0,
+  "created_by_alias" varchar(255) NOT NULL DEFAULT '',
+  "modified" timestamp without time zone NOT NULL DEFAULT '1970-01-01 00:00:00',
+  "modified_by" integer NOT NULL DEFAULT 0,
   "metakey" text NOT NULL,
   "metadesc" text NOT NULL,
   "metadata" text NOT NULL,
-  "featured" smallint DEFAULT 0 NOT NULL,
-  "xreference" varchar(50) NOT NULL,
-  "publish_up" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
-  "publish_down" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
-  "version" bigint DEFAULT 1 NOT NULL,
-  "hits" bigint DEFAULT 0 NOT NULL,
+  "featured" smallint NOT NULL DEFAULT 0,
+  "xreference" varchar(50) NOT NULL DEFAULT '',
+  "publish_up" timestamp without time zone NOT NULL DEFAULT '1970-01-01 00:00:00',
+  "publish_down" timestamp without time zone NOT NULL DEFAULT '1970-01-01 00:00:00',
+  "version" bigint NOT NULL DEFAULT 1,
+  "hits" bigint NOT NULL DEFAULT 0,
   PRIMARY KEY ("id")
 );
 CREATE INDEX "#__contact_details_idx_access" ON "#__contact_details" ("access");
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index d3ea37d47c18a..a127ada25e7a9 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -405,22 +405,22 @@ SET QUOTED_IDENTIFIER ON;
 
 CREATE TABLE [#__contact_details](
 	[id] [int] IDENTITY(1,1) NOT NULL,
-	[name] [nvarchar](255) NOT NULL DEFAULT '',
+	[name] [nvarchar](255) NOT NULL,
 	[alias] [nvarchar](255) NOT NULL,
-	[con_position] [nvarchar](255) NULL,
-	[address] [nvarchar](max) NULL,
-	[suburb] [nvarchar](100) NULL,
-	[state] [nvarchar](100) NULL,
-	[country] [nvarchar](100) NULL,
-	[postcode] [nvarchar](100) NULL,
-	[telephone] [nvarchar](255) NULL,
-	[fax] [nvarchar](255) NULL,
-	[misc] [nvarchar](max) NULL,
-	[image] [nvarchar](255) NULL,
-	[email_to] [nvarchar](255) NULL,
+	[con_position] [nvarchar](255),
+	[address] [nvarchar](max),
+	[suburb] [nvarchar](100),
+	[state] [nvarchar](100),
+	[country] [nvarchar](100),
+	[postcode] [nvarchar](100),
+	[telephone] [nvarchar](255),
+	[fax] [nvarchar](255),
+	[misc] [nvarchar](max),
+	[image] [nvarchar](255),
+	[email_to] [nvarchar](255),
 	[default_con] [tinyint] NOT NULL DEFAULT 0,
-	[published] [smallint] NOT NULL,
-	[checked_out] [int] NOT NULL,
+	[published] [smallint] NOT NULL DEFAULT 0,
+	[checked_out] [int] NOT NULL DEFAULT 0,
 	[checked_out_time] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[ordering] [int] NOT NULL DEFAULT 0,
 	[params] [nvarchar](max) NOT NULL,
@@ -429,20 +429,20 @@ CREATE TABLE [#__contact_details](
 	[access] [int] NOT NULL DEFAULT 0,
 	[mobile] [nvarchar](255) NOT NULL DEFAULT '',
 	[webpage] [nvarchar](255) NOT NULL DEFAULT '',
-	[sortname1] [nvarchar](255) NOT NULL,
-	[sortname2] [nvarchar](255) NOT NULL,
-	[sortname3] [nvarchar](255) NOT NULL,
+	[sortname1] [nvarchar](255) NOT NULL DEFAULT '',
+	[sortname2] [nvarchar](255) NOT NULL DEFAULT '',
+	[sortname3] [nvarchar](255) NOT NULL DEFAULT '',
 	[language] [nvarchar](7) NOT NULL,
 	[created] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[created_by] [bigint] NOT NULL DEFAULT 0,
-	[created_by_alias] [nvarchar](255) NOT NULL,
+	[created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
 	[modified] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[modified_by] [bigint] NOT NULL DEFAULT 0,
 	[metakey] [nvarchar](max) NOT NULL,
 	[metadesc] [nvarchar](max) NOT NULL,
 	[metadata] [nvarchar](max) NOT NULL,
 	[featured] [tinyint] NOT NULL DEFAULT 0,
-	[xreference] [nvarchar](50) NOT NULL,
+	[xreference] [nvarchar](50) NOT NULL DEFAULT '',
 	[publish_up] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[publish_down] [datetime2](0) NOT NULL DEFAULT '1900-01-01 00:00:00',
 	[version] [bigint] NOT NULL DEFAULT 1,

From 868ce6a311c4c9dd00ac0564446ca81dbf99f932 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sun, 19 Feb 2017 22:20:52 +0100
Subject: [PATCH 11/18] remove two not used language strings from com_menus
 (#14140)

---
 administrator/language/en-GB/en-GB.com_menus.ini | 2 --
 1 file changed, 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index 77bfe99f9cb8c..aa5cccc2bf82a 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -85,8 +85,6 @@ COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL=" Menu"
 COM_MENUS_ITEM_FIELD_ASSOCIATION_NO_VALUE="- No association -"
 COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC="Target browser window when the menu item is selected."
 COM_MENUS_ITEM_FIELD_BROWSERNAV_LABEL="Target Window"
-COM_MENUS_ITEM_FIELD_CLIENT_ID_DESC="Choose the client application menu"
-COM_MENUS_ITEM_FIELD_CLIENT_ID_LABEL="Client"
 COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_DESC="Select the menu items that should be shown or not under this container. If there are no items to show, then this container will also be hidden.<br>Please note that when you install a new component it will be displayed by default until you come back here and hide it too."
 COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_LABEL="Show or Hide Menu Items"
 COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED="Hide Unassigned Modules"

From 97202a1ecda5d4f03de70267a4edb6572998b483 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Thevenet <mat@idimweb.com>
Date: Mon, 20 Feb 2017 10:57:15 -0400
Subject: [PATCH 12/18] [com_fields] unused language strings (#14154)

Pull Request for Issue #14148 .

Testing Instructions

Easy fix
Test on code review

(sorry, I didn't succeded to commit the 3 in one PR directly from GitHub :open_mouth: )
---
 administrator/language/en-GB/en-GB.com_users.ini | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
index 5828fa4f966b9..285ed78fd9871 100644
--- a/administrator/language/en-GB/en-GB.com_users.ini
+++ b/administrator/language/en-GB/en-GB.com_users.ini
@@ -373,7 +373,3 @@ JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong
 ; Categories overrides
 COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category"
 COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category"
-; Fields overrides
-COM_USERS_USER_CATEGORIES_TITLE="Users: Field Groups"
-COM_USERS_USER_CATEGORY_ADD_TITLE="Users: New Field Group"
-COM_USERS_USER_CATEGORY_EDIT_TITLE="Users: Edit Field Group"

From bc5a805d6622934e799306135c46fcf56ec56bd7 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Thevenet <mat@idimweb.com>
Date: Mon, 20 Feb 2017 10:57:46 -0400
Subject: [PATCH 13/18] [com_fields] unused language strings (#14153)

Pull Request for Issue #14148 .

### Testing Instructions

Easy fix
Test on code review
---
 administrator/language/en-GB/en-GB.com_contact.ini | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini
index 3ad7a6a3ef1ca..01f70cf645e00 100644
--- a/administrator/language/en-GB/en-GB.com_contact.ini
+++ b/administrator/language/en-GB/en-GB.com_contact.ini
@@ -307,8 +307,3 @@ JGLOBAL_FIELDSET_MISCELLANEOUS="Miscellaneous Information"
 JGLOBAL_NEWITEMSLAST_DESC="New Contacts default to the last position. Ordering can be changed after this Contact is saved."
 JLIB_HTML_BATCH_USER_LABEL="Set Linked User"
 JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."
-
-; Fields overrides
-COM_CONTACT_CONTACT_CATEGORIES_TITLE="Contacts: Field Groups"
-COM_CONTACT_CONTACT_CATEGORY_ADD_TITLE="Contacts: New Field Group"
-COM_CONTACT_CONTACT_CATEGORY_EDIT_TITLE="Contacts: Edit Field Group"

From ca9dd9db3ef357c07948378f89e53a748d1284ca Mon Sep 17 00:00:00 2001
From: Marc-Antoine Thevenet <mat@idimweb.com>
Date: Mon, 20 Feb 2017 10:57:59 -0400
Subject: [PATCH 14/18] [com_fields] unused language strings (#14152)

Following the issue #14148

Easy fix
Test on code review
---
 administrator/language/en-GB/en-GB.com_content.ini | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini
index b666d1f608139..edc6ce87e787e 100644
--- a/administrator/language/en-GB/en-GB.com_content.ini
+++ b/administrator/language/en-GB/en-GB.com_content.ini
@@ -200,8 +200,3 @@ JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new ar
 JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these articles."
 JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."
 JLIB_RULES_SETTING_NOTES_ITEM="Changes apply to this article only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."
-
-; Fields overrides
-COM_CONTENT_ARTICLE_CATEGORIES_TITLE="Articles: Field Groups"
-COM_CONTENT_ARTICLE_CATEGORY_ADD_TITLE="Articles: New Field Group"
-COM_CONTENT_ARTICLE_CATEGORY_EDIT_TITLE="Articles: Edit Field Group"

From 5c6001dfff3c694ae119ad02247dc1c1603cc9f6 Mon Sep 17 00:00:00 2001
From: bertmert <bertmert@users.noreply.github.com>
Date: Mon, 20 Feb 2017 20:36:32 +0100
Subject: [PATCH 15/18] com_content. FE editing. Category creation on-the-fly
 with less than 10 categories. (#14094)

* Category selection. disable_search_threshold to 0

* just one space to much ;)
---
 components/com_content/views/form/tmpl/edit.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/com_content/views/form/tmpl/edit.php b/components/com_content/views/form/tmpl/edit.php
index 11c67abce878c..3637d2a3b95cc 100644
--- a/components/com_content/views/form/tmpl/edit.php
+++ b/components/com_content/views/form/tmpl/edit.php
@@ -12,6 +12,7 @@
 JHtml::_('behavior.tabstate');
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0));
 JHtml::_('formbehavior.chosen', 'select');
 
 // Create shortcut to parameters.

From ed5f02f8a2dccc656af1df67d0e0a784eaea8150 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@phil-taylor.com>
Date: Mon, 20 Feb 2017 19:37:41 +0000
Subject: [PATCH 16/18] Ensure Itemid is cast to int (#14158)

---
 modules/mod_search/mod_search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mod_search/mod_search.php b/modules/mod_search/mod_search.php
index 113ec2150b2b4..09f7b06f44ca6 100644
--- a/modules/mod_search/mod_search.php
+++ b/modules/mod_search/mod_search.php
@@ -47,5 +47,5 @@
 	$img = ModSearchHelper::getSearchImage($button_text);
 }
 
-$mitemid = $set_Itemid > 0 ? $set_Itemid : $app->input->get('Itemid');
+$mitemid = $set_Itemid > 0 ? $set_Itemid : $app->input->getInt('Itemid');
 require JModuleHelper::getLayoutPath('mod_search', $params->get('layout', 'default'));

From 67042e34b7583e507e5af90d8b4ae96279f21547 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Mon, 20 Feb 2017 21:54:33 +0100
Subject: [PATCH 17/18] Updating brasilian installation language files

---
 installation/language/pt-BR/pt-BR.ini | 43 ++++++++++++++++++---------
 installation/language/pt-BR/pt-BR.xml | 11 +++----
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/installation/language/pt-BR/pt-BR.ini b/installation/language/pt-BR/pt-BR.ini
index 3a11276704e1a..a2ba276774f00 100644
--- a/installation/language/pt-BR/pt-BR.ini
+++ b/installation/language/pt-BR/pt-BR.ini
@@ -29,7 +29,7 @@ INSTL_PRECHECK_ACTUAL="Atual"
 ; Database view
 INSTL_DATABASE="Configuração do Banco de Dados"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Consulta ao banco PostgreSQL falhou."
-INSTL_DATABASE_HOST_DESC="Costuma ser "_QQ_"localhost"_QQ_"."
+INSTL_DATABASE_HOST_DESC="Isso geralmente é "_QQ_"localhost"_QQ_" ou um nome fornecido pela empresa de hospedagem."
 INSTL_DATABASE_HOST_LABEL="Nome do servidor"
 INSTL_DATABASE_NAME_DESC="Alguns servidores permitem apenas um nome específico de Banco de Dados por site. Neste caso, use o prefixo de tabelas para diferentes sites Joomla."
 INSTL_DATABASE_NAME_LABEL="Nome do banco de dados"
@@ -43,7 +43,7 @@ INSTL_DATABASE_PREFIX_LABEL="Prefixo das tabelas"
 INSTL_DATABASE_PREFIX_MSG="O prefixo de tabela deve começar com uma letra, seguido por caracteres alfanuméricos opcionais e por um sublinhado"
 INSTL_DATABASE_TYPE_DESC="Provavelmente é "_QQ_"MySQLi"_QQ_"."
 INSTL_DATABASE_TYPE_LABEL="Tipo de Banco de dados"
-INSTL_DATABASE_USER_DESC="Algo como "_QQ_"root"_QQ_" ou um nome de usuário dado pelo local de hospedagem."
+INSTL_DATABASE_USER_DESC="Um nome de usuário que você criou ou fornecido pelo seu local de hospedagem."
 INSTL_DATABASE_USER_LABEL="Nome de Usuário"
 
 
@@ -66,7 +66,7 @@ INSTL_FTP_PASSWORD_DESC="ATENÇÃO! Recomenda-se deixar em branco e informar sua
 
 ;Site View
 INSTL_SITE="Configurações Principais"
-INSTL_ADMIN_EMAIL_LABEL="Email do Administrador"
+INSTL_ADMIN_EMAIL_LABEL="E-mail do administrador"
 INSTL_ADMIN_EMAIL_DESC="Informe um endereço de email. Este será o endereço de email do Super Usuário do site."
 INSTL_ADMIN_PASSWORD_LABEL="Senha do Administrador"
 INSTL_ADMIN_PASSWORD_DESC="Defina a senha para a conta do Super Usuário e confirme no campo abaixo."
@@ -93,6 +93,7 @@ INSTL_SAMPLE_BROCHURE_SET_DESC="Instale o Joomla com algumas páginas (um menu c
 INSTL_SAMPLE_DATA_SET_DESC="Instale o Joomla com uma página (um menu com um link) e módulos como Últimos Artigos, Formulário de Acesso."
 INSTL_SAMPLE_LEARN_SET_DESC="Instale o Joomla com conteúdo de exemplo que descrevem como o Joomla funciona."
 INSTL_SAMPLE_TESTING_SET_DESC="Instale o Joomla com todos os itens de menu possíveis para ajudar a testar o Joomla."
+INSTL_SUPER_USER_TITLE="Detalhes da conta do super usuário"
 
 ;Summary view
 INSTL_FINALISATION="Finalização"
@@ -159,18 +160,19 @@ INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla definiu %s como o idioma padrão
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Selecione"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Idioma"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ADD_ASSOCIATIONS="Joomla não pode criar automaticamente as associações de idiomas."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla não pode criar automaticamente o idioma de conteúdo %s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla não pode criar automaticamente o menu %s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla não pode criar automaticamente o item de menu home %s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla não pode criar automaticamente o módulo de menu %s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla não pode criar automaticamente a categoria de conteúdo %s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla não pode criar automaticamente o artigo %s localizado"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla não pode publicar automaticamente o módulo de troca de idiomas"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla não pode ativar automaticamente o Plugin de código de idioma"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla não pode ativar automaticamente o Plugin filtro de idioma"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla não pode criar automaticamente o menu %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla não pode criar automaticamente o item de menu inicial %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla não pode criar automaticamente o módulo de menu %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla não pode criar automaticamente a categoria de conteúdo %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla não pode criar automaticamente o artigo localizado %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla não pode publicar automaticamente o módulo de troca de idiomas."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla não pode ativar automaticamente o Plugin de Código de Idioma."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla não pode ativar automaticamente o Plugin Filtro de Idioma."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla não pôde instalar o idioma %s."
-INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla não pode publicar automaticamente o módulo de estado de idioma"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla não pode despublicar automaticamente o módulo de menu padrão"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla não pode publicar automaticamente o módulo de estado de idioma."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla não pode despublicar automaticamente o módulo de menu padrão."
 INSTL_DEFAULTLANGUAGE_DESC="Joomla instalou os idiomas a seguir. Selecione o padrão desejado para o administrador Joomla."
 INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla instalou os seguintes idiomas. Selecione o padrão desejado para o Site."
 INSTL_DEFAULTLANGUAGE_FRONTEND="Idioma padrão do Site "
@@ -276,7 +278,7 @@ JCHECK_AGAIN="Verificar Novamente"
 JERROR="Erro"
 JEMAIL="Email"
 JGLOBAL_ISFREESOFTWARE="%s é um software gratuito distribuído sob a %s."
-JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="O pacote de idioma não coincide com a versão do Joomla!. Algumas strings podem estar faltando."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="O pacote de idioma não coincide com essa versão do Joomla! Algumas strings podem estar faltando e serão exibidas em inglês."
 JGLOBAL_SELECT_AN_OPTION="Selecione uma opção"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="Nenhum resultado correspondente "
 JGLOBAL_SELECT_SOME_OPTIONS="Selecione algumas opções"
@@ -326,3 +328,16 @@ SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
 SQLSRV="Microsoft SQL Server"
 
+; Javascript message titles
+ERROR="Erro"
+MESSAGE="Mensagem"
+NOTICE="Observação"
+WARNING="Aviso"
+
+; Javascript ajax error messages
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A conexão foi abortada ao solicitar os dados JSON."
+JLIB_JS_AJAX_ERROR_NO_CONTENT="Nenhum conteúdo foi retornado."
+JLIB_JS_AJAX_ERROR_OTHER="Ocorreu um erro ao buscar os dados JSON: código de status HTTP %s."
+JLIB_JS_AJAX_ERROR_PARSE="Ocorreu um erro de interpretação ao processar os dados JSON a seguir: <br/> <code style="_QQ_"color:inherit;white-space:pre;padding:0;margin:0;border:0;background:inherit;"_QQ_">%s</code>"
+JLIB_JS_AJAX_ERROR_TIMEOUT="O limite de tempo esgotou-se ao buscar os dados JSON."
+
diff --git a/installation/language/pt-BR/pt-BR.xml b/installation/language/pt-BR/pt-BR.xml
index 16a0c1dbf8f3b..8c235910ae3e5 100644
--- a/installation/language/pt-BR/pt-BR.xml
+++ b/installation/language/pt-BR/pt-BR.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.6"
+	version="3.7"
 	client="installation">
 	<name>Português do Brasil (pt-BR)</name>
-	<version>3.6.1</version>
-	<creationDate>2016-07-24</creationDate>
-	<author>Equipe de Tradução Português Brasileiro</author>
-	<copyright>Copyright (C) 2005-2015 Open Source Matters. Todos os direitos reservados.</copyright>
+	<version>3.7.0</version>
+	<creationDate>Fevereiro de 2017</creationDate>
+	<author>Equipe de Tradução pt-BR (Português do Brasil)</author>
+	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<files>
 		<filename>pt-BR.ini</filename>
 	</files>
 	<metadata>
 		<name>Português do Brasil (pt-BR)</name>
+		<nativeName>Português do Brasil (pt-BR)</nativeName>
 		<tag>pt-BR</tag>
 		<rtl>0</rtl>
 	</metadata>

From bad24c41d18c0750812714b5117cac25fb2f5a4a Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Mon, 20 Feb 2017 21:38:31 +0000
Subject: [PATCH 18/18] Update symfony yaml library

---
 composer.lock                            | 10 +--
 libraries/vendor/composer/installed.json | 90 ++++++++++++------------
 libraries/vendor/symfony/yaml/Inline.php |  2 +-
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/composer.lock b/composer.lock
index f78fe05a08dcf..549a636e87001 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1087,16 +1087,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.16",
+            "version": "v2.8.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2"
+                "reference": "322a8c2dfbca15ad6b1b27e182899f98ec0e0153"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
-                "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/322a8c2dfbca15ad6b1b27e182899f98ec0e0153",
+                "reference": "322a8c2dfbca15ad6b1b27e182899f98ec0e0153",
                 "shasum": ""
             },
             "require": {
@@ -1132,7 +1132,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-03T13:49:52+00:00"
+            "time": "2017-01-21T16:40:50+00:00"
         }
     ],
     "packages-dev": [
diff --git a/libraries/vendor/composer/installed.json b/libraries/vendor/composer/installed.json
index b8ddf1ed36364..3430667e290e4 100644
--- a/libraries/vendor/composer/installed.json
+++ b/libraries/vendor/composer/installed.json
@@ -1083,25 +1083,64 @@
         ],
         "description": "PHPMailer is a full-featured email creation and transfer class for PHP"
     },
+    {
+        "name": "joomla/ldap",
+        "version": "1.1.2",
+        "version_normalized": "1.1.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/ldap.git",
+            "reference": "91c3827a7f6d7164a3bf49eede27419321e4dcbc"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/ldap/zipball/91c3827a7f6d7164a3bf49eede27419321e4dcbc",
+            "reference": "91c3827a7f6d7164a3bf49eede27419321e4dcbc",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.10"
+        },
+        "time": "2014-04-10T03:07:59+00:00",
+        "type": "joomla-package",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Ldap\\": "src/",
+                "Joomla\\Ldap\\Tests\\": "Tests/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Joomla LDAP Package",
+        "homepage": "https://github.com/joomla-framework/ldap",
+        "keywords": [
+            "framework",
+            "joomla",
+            "ldap"
+        ]
+    },
     {
         "name": "symfony/yaml",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
+        "version": "v2.8.17",
+        "version_normalized": "2.8.17.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/yaml.git",
-            "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2"
+            "reference": "322a8c2dfbca15ad6b1b27e182899f98ec0e0153"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/yaml/zipball/dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
-            "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
+            "url": "https://api.github.com/repos/symfony/yaml/zipball/322a8c2dfbca15ad6b1b27e182899f98ec0e0153",
+            "reference": "322a8c2dfbca15ad6b1b27e182899f98ec0e0153",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.9"
         },
-        "time": "2017-01-03T13:49:52+00:00",
+        "time": "2017-01-21T16:40:50+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1133,44 +1172,5 @@
         ],
         "description": "Symfony Yaml Component",
         "homepage": "https://symfony.com"
-    },
-    {
-        "name": "joomla/ldap",
-        "version": "1.1.2",
-        "version_normalized": "1.1.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/joomla-framework/ldap.git",
-            "reference": "91c3827a7f6d7164a3bf49eede27419321e4dcbc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/joomla-framework/ldap/zipball/91c3827a7f6d7164a3bf49eede27419321e4dcbc",
-            "reference": "91c3827a7f6d7164a3bf49eede27419321e4dcbc",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.10"
-        },
-        "time": "2014-04-10T03:07:59+00:00",
-        "type": "joomla-package",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Joomla\\Ldap\\": "src/",
-                "Joomla\\Ldap\\Tests\\": "Tests/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "GPL-2.0+"
-        ],
-        "description": "Joomla LDAP Package",
-        "homepage": "https://github.com/joomla-framework/ldap",
-        "keywords": [
-            "framework",
-            "joomla",
-            "ldap"
-        ]
     }
 ]
diff --git a/libraries/vendor/symfony/yaml/Inline.php b/libraries/vendor/symfony/yaml/Inline.php
index 74d23be0a7768..e08d901c29d28 100644
--- a/libraries/vendor/symfony/yaml/Inline.php
+++ b/libraries/vendor/symfony/yaml/Inline.php
@@ -21,7 +21,7 @@
  */
 class Inline
 {
-    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
+    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*+(?:\\\\.[^"\\\\]*+)*+)"|\'([^\']*+(?:\'\'[^\']*+)*+)\')';
 
     private static $exceptionOnInvalidType = false;
     private static $objectSupport = false;