Merge branch '5.4' into 6.0

* 5.4:
  Fix small typos on Core Team page

Author: javiereguiluz

contributing/code/core_team.rst

@@ -156,8 +156,8 @@ A pull request **can be merged** if:
 
 * Enough time was given for peer reviews;
 
-* At least two **Merger Team** members voted ``+1`` (only one if the submitter
-  is part of the Merger team) and no Core member voted ``-1`` (via GitHub
+* At least two **Mergers Team** members voted ``+1`` (only one if the submitter
+  is part of the Mergers team) and no Core member voted ``-1`` (via GitHub
   reviews or as comments).
 
 Pull Request Merging Process