diff --git a/doc/classes/CollisionObject2D.xml b/doc/classes/CollisionObject2D.xml
index 48a198b2488..91f283a2b7e 100644
--- a/doc/classes/CollisionObject2D.xml
+++ b/doc/classes/CollisionObject2D.xml
@@ -40,6 +40,14 @@
 				Returns the object's [RID].
 			</description>
 		</method>
+		<method name="get_shape_owner_one_way_collision_margin" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="owner_id" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="get_shape_owners">
 			<return type="Array">
 			</return>
@@ -185,6 +193,16 @@
 				If [code]enable[/code] is [code]true[/code], collisions for the shape owner originating from this [code]CollisionObject2D[/code] will not be reported to collided with [code]CollisionObject2D[/code]s.
 			</description>
 		</method>
+		<method name="shape_owner_set_one_way_collision_margin">
+			<return type="void">
+			</return>
+			<argument index="0" name="owner_id" type="int">
+			</argument>
+			<argument index="1" name="margin" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="shape_owner_set_transform">
 			<return type="void">
 			</return>
diff --git a/doc/classes/CollisionPolygon2D.xml b/doc/classes/CollisionPolygon2D.xml
index f63adbf71ab..3dd87a41206 100644
--- a/doc/classes/CollisionPolygon2D.xml
+++ b/doc/classes/CollisionPolygon2D.xml
@@ -22,6 +22,8 @@
 		<member name="one_way_collision" type="bool" setter="set_one_way_collision" getter="is_one_way_collision_enabled">
 			If [code]true[/code], only edges that face up, relative to CollisionPolygon2D's rotation, will collide with other objects.
 		</member>
+		<member name="one_way_collision_margin" type="float" setter="set_one_way_collision_margin" getter="get_one_way_collision_margin">
+		</member>
 		<member name="polygon" type="PoolVector2Array" setter="set_polygon" getter="get_polygon">
 			The polygon's list of vertices. The final point will be connected to the first.
 		</member>
diff --git a/doc/classes/CollisionShape2D.xml b/doc/classes/CollisionShape2D.xml
index d3c616ee3d8..07dbde1c219 100644
--- a/doc/classes/CollisionShape2D.xml
+++ b/doc/classes/CollisionShape2D.xml
@@ -20,6 +20,8 @@
 		<member name="one_way_collision" type="bool" setter="set_one_way_collision" getter="is_one_way_collision_enabled">
 			Sets whether this collision shape should only detect collision on one side (top or bottom).
 		</member>
+		<member name="one_way_collision_margin" type="float" setter="set_one_way_collision_margin" getter="get_one_way_collision_margin">
+		</member>
 		<member name="shape" type="Shape2D" setter="set_shape" getter="get_shape">
 			The actual shape owned by this collision shape.
 		</member>
diff --git a/doc/classes/EditorProperty.xml b/doc/classes/EditorProperty.xml
index 7d095543303..b3fc036edbf 100644
--- a/doc/classes/EditorProperty.xml
+++ b/doc/classes/EditorProperty.xml
@@ -9,6 +9,20 @@
 	<demos>
 	</demos>
 	<methods>
+		<method name="emit_changed">
+			<return type="void">
+			</return>
+			<argument index="0" name="property" type="String">
+			</argument>
+			<argument index="1" name="value" type="Variant">
+			</argument>
+			<argument index="2" name="field" type="String" default="&quot;&quot;">
+			</argument>
+			<argument index="3" name="changing" type="bool" default="false">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="get_edited_object">
 			<return type="Object">
 			</return>
diff --git a/doc/classes/InputEventMIDI.xml b/doc/classes/InputEventMIDI.xml
new file mode 100644
index 00000000000..2cdd70e42c3
--- /dev/null
+++ b/doc/classes/InputEventMIDI.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="InputEventMIDI" inherits="InputEvent" category="Core" version="3.1">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<tutorials>
+	</tutorials>
+	<demos>
+	</demos>
+	<methods>
+	</methods>
+	<members>
+		<member name="channel" type="int" setter="set_channel" getter="get_channel">
+		</member>
+		<member name="controller_number" type="int" setter="set_controller_number" getter="get_controller_number">
+		</member>
+		<member name="controller_value" type="int" setter="set_controller_value" getter="get_controller_value">
+		</member>
+		<member name="instrument" type="int" setter="set_instrument" getter="get_instrument">
+		</member>
+		<member name="message" type="int" setter="set_message" getter="get_message">
+		</member>
+		<member name="pitch" type="int" setter="set_pitch" getter="get_pitch">
+		</member>
+		<member name="pressure" type="int" setter="set_pressure" getter="get_pressure">
+		</member>
+		<member name="velocity" type="int" setter="set_velocity" getter="get_velocity">
+		</member>
+	</members>
+	<constants>
+	</constants>
+</class>
diff --git a/doc/classes/Physics2DServer.xml b/doc/classes/Physics2DServer.xml
index cd887ff9506..fe1465260f6 100644
--- a/doc/classes/Physics2DServer.xml
+++ b/doc/classes/Physics2DServer.xml
@@ -735,6 +735,8 @@
 			</argument>
 			<argument index="2" name="enable" type="bool">
 			</argument>
+			<argument index="3" name="margin" type="float">
+			</argument>
 			<description>
 				Enables one way collision on body if [code]enable[/code] is [code]true[/code].
 			</description>
diff --git a/doc/classes/StyleBox.xml b/doc/classes/StyleBox.xml
index dee3e6db49d..be21abe275e 100644
--- a/doc/classes/StyleBox.xml
+++ b/doc/classes/StyleBox.xml
@@ -27,6 +27,12 @@
 			<description>
 			</description>
 		</method>
+		<method name="get_current_item_drawn" qualifiers="const">
+			<return type="CanvasItem">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="get_margin" qualifiers="const">
 			<return type="float">
 			</return>
diff --git a/doc/classes/SurfaceTool.xml b/doc/classes/SurfaceTool.xml
index 2e5d5d81c9e..fd158587e56 100644
--- a/doc/classes/SurfaceTool.xml
+++ b/doc/classes/SurfaceTool.xml
@@ -75,14 +75,6 @@
 				Specify a Tangent for the next Vertex to use.
 			</description>
 		</method>
-		<method name="add_to_format">
-			<return type="void">
-			</return>
-			<argument index="0" name="flags" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="add_triangle_fan">
 			<return type="void">
 			</return>
diff --git a/doc/classes/Theme.xml b/doc/classes/Theme.xml
index 8c6acd2c514..bffd8ea6d96 100644
--- a/doc/classes/Theme.xml
+++ b/doc/classes/Theme.xml
@@ -80,6 +80,14 @@
 				Sets theme values to a copy of the default theme values.
 			</description>
 		</method>
+		<method name="copy_theme">
+			<return type="void">
+			</return>
+			<argument index="0" name="other" type="Theme">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="get_color" qualifiers="const">
 			<return type="Color">
 			</return>
diff --git a/doc/classes/TileSet.xml b/doc/classes/TileSet.xml
index 9e31f7e1b1b..4abe94f1193 100644
--- a/doc/classes/TileSet.xml
+++ b/doc/classes/TileSet.xml
@@ -439,6 +439,16 @@
 				Returns the one-way collision value of a tile's shape.
 			</description>
 		</method>
+		<method name="tile_get_shape_one_way_margin" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="shape_id" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="tile_get_shape_transform" qualifiers="const">
 			<return type="Transform2D">
 			</return>
@@ -633,6 +643,18 @@
 				Enables one-way collision on a tile's shape.
 			</description>
 		</method>
+		<method name="tile_set_shape_one_way_margin">
+			<return type="void">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="shape_id" type="int">
+			</argument>
+			<argument index="2" name="one_way" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="tile_set_shape_transform">
 			<return type="void">
 			</return>
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index 87b40d54472..8d1a24dbf83 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -756,7 +756,7 @@ void Theme::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_emit_theme_changed"), &Theme::_emit_theme_changed);
 
 	ClassDB::bind_method("copy_default_theme", &Theme::copy_default_theme);
-	ClassDB::bind_method("copy_theme", &Theme::copy_theme);
+	ClassDB::bind_method(D_METHOD("copy_theme", "other"), &Theme::copy_theme);
 
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "default_font", PROPERTY_HINT_RESOURCE_TYPE, "Font"), "set_default_font", "get_default_font");
 }
diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp
index 99f539ea866..ca914b67e05 100644
--- a/servers/physics_2d_server.cpp
+++ b/servers/physics_2d_server.cpp
@@ -620,7 +620,7 @@ void Physics2DServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("body_clear_shapes", "body"), &Physics2DServer::body_clear_shapes);
 
 	ClassDB::bind_method(D_METHOD("body_set_shape_disabled", "body", "shape_idx", "disable"), &Physics2DServer::body_set_shape_disabled);
-	ClassDB::bind_method(D_METHOD("body_set_shape_as_one_way_collision", "body", "shape_idx", "enable"), &Physics2DServer::body_set_shape_as_one_way_collision);
+	ClassDB::bind_method(D_METHOD("body_set_shape_as_one_way_collision", "body", "shape_idx", "enable", "margin"), &Physics2DServer::body_set_shape_as_one_way_collision);
 
 	ClassDB::bind_method(D_METHOD("body_attach_object_instance_id", "body", "id"), &Physics2DServer::body_attach_object_instance_id);
 	ClassDB::bind_method(D_METHOD("body_get_object_instance_id", "body"), &Physics2DServer::body_get_object_instance_id);