Merge branch '6.4' into 7.2

* 6.4:
  minor

Author: OskarStark

.doctor-rst.yaml

@@ -74,7 +74,6 @@ rules:
     versionadded_directive_should_have_version: ~
     yaml_instead_of_yml_suffix: ~
 
-    #   master
     versionadded_directive_major_version:
         major_version: 7