merged 2.1

Author: DavertMik

src/Codeception/Module/Sequence.php

@@ -96,4 +96,4 @@ public function _afterSuite()
     require_once __DIR__ . '/../Util/sqs.php';
 } else {
     throw new ModuleException('Codeception\Module\Sequence', "function 'sq' and 'sqs' already defined");
-}
+}

src/Codeception/Util/sq.php

@@ -13,5 +13,4 @@ function sq($id = null)
         }
         return $sequence;
     }
-
-}
+}

tests/unit/Codeception/Module/SequenceTest.php

@@ -26,4 +26,4 @@ public function testSuiteSequences()
         $module->_afterSuite();
         $this->assertNotEquals($old, sqs(1));
     }
-}
+}