Merge remote-tracking branch 'origin/master' into develop

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/storage/test_events.py b/tests/storage/test_events.py

index 313013009e..946cd3e9f2 100644
--- a/tests/storage/test_events.py
+++ b/tests/storage/test_events.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import uuid
-from mock.mock import Mock
+from mock import Mock
 from synapse.types import RoomID, UserID
 
 from tests import unittest