Merge branch 'master' into 3.0

Author: gsherwood

package.xml

@@ -1165,6 +1165,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="ControlSignatureUnitTest.js.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ControlSignatureUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ElseIfDeclarationUnitTest.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="ElseIfDeclarationUnitTest.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ElseIfDeclarationUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ForEachLoopDeclarationUnitTest.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ForEachLoopDeclarationUnitTest.inc.fixed" role="test" />