Merge branch '2.0' into 2.1

tests/handlers/api/controller/test_settings.py

@@ -29,4 +29,5 @@ def test_settings(http_controller):
     assert response.status == 201
     response = http_controller.get('/settings', example=True)
     assert response.status == 200
-    assert response.json == query
+    assert response.json["test"] is True
+    assert response.json["modification_uuid"] is not None