From ea619794e54bdcd269f504440491ce1848eb6bb3 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Sat, 17 Dec 2016 10:16:35 -0500
Subject: [PATCH 1/2] Fix documentation markup

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 doc/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/faq.rst b/doc/faq.rst
index 888b56bb05..2815e6f8de 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -146,7 +146,7 @@ The MySQL manual explains how to `reset the permissions
 1.15 I have problems with *mysql.user* column names.
 ----------------------------------------------------
 
-In previous MySQL versions, the ``User`` and ``Password``columns were
+In previous MySQL versions, the ``User`` and ``Password`` columns were
 named ``user`` and ``password``. Please modify your column names to
 align with current standards.
 

From 33af5ac3d6e2fdd0a9fa9730ded87190e0f38294 Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Mon, 19 Dec 2016 13:45:00 +0530
Subject: [PATCH 2/2] Uncomment mistakenly commented Selenium testing setting

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 phpunit.xml.dist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ac0488f79a..2e2d1d226f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -27,9 +27,9 @@
             <directory suffix="_test.php">test/libraries/rte</directory>
             <directory suffix="_test.php">test/libraries</directory>
         </testsuite>
-        <!-- <testsuite name="Selenium">
+        <testsuite name="Selenium">
             <directory suffix="Test.php">test/selenium</directory>
-        </testsuite> -->
+        </testsuite>
     </testsuites>
 
     <logging>