Merge branch 'develop' into forgot_password_captcha

# Conflicts:
#	api/models/authentication/ForgotPasswordForm.php

tests/codeception/api/unit/TestCase.php

@@ -1,6 +1,8 @@
 <?php
 namespace tests\codeception\api\unit;
 
+use Mockery;
+
 class TestCase extends \Codeception\Test\Unit  {
 
     /**
@@ -19,4 +21,9 @@ class TestCase extends \Codeception\Test\Unit  {
         return [];
     }
 
+    protected function tearDown() {
+        parent::tearDown();
+        Mockery::close();
+    }
+
 }