Step 1 of Merging branch 'master' into sdl2.0 in a try to minimize conflicts

docs/CHANGES.txt

@@ -7,25 +7,40 @@ Various contributors (see below, and AUTHORS.txt)
 http://www.tuxpaint.org/
 
 
-2022.January.20 (0.9.28)
+2022.January.24 (0.9.28)
   * Improvements to "Paint" and "Lines" tools:
     ------------------------------------------
     * Brush spacing may now be altered within Tux Paint.
       + Note: A "nobrushspacing" simplifcation option is provided to
         disable this feature; Tux Paint will continue using the brushes'
         default spacings.
+      Bill Kendrick <bill@newbreedsoftware.com>
 
     * Many brushes have been given more reasonable default spacing
       settings (e.g., star brush's new default spacing causes
       individual stars to appear, rather than a 'smear').
       Closes https://sourceforge.net/p/tuxpaint/bugs/243/
       (h/t Areti Tsolakidou for the suggestion)
+      Bill Kendrick <bill@newbreedsoftware.com>
 
   * Improvements to "Eraser" tool:
     ------------------------------
     * Outline for circle-shaped erasers is now also circular.
       Closes https://sourceforge.net/p/tuxpaint/bugs/244/
       (h/t Areti Tsolakidou for the suggestion)
+      Bill Kendrick <bill@newbreedsoftware.com>
+
+  * Improvements to "Shapes" tool:
+    ------------------------------
+    * Added hexagon (6-sided polygon) and heptagon (7-sided) shapes.
+      Bill Kendrick <bill@newbreedsoftware.com>
+
+    * Showing aspect ratio of shapes when stretching them.
+      Bill Kendrick <bill@newbreedsoftware.com>
+
+    * Using floats more, allowing for proper heptagon support, as
+      well as a non-skewed starting angle for octagons (22.5 degrees).
+      Bill Kendrick <bill@newbreedsoftware.com>
 
   * Localization Updates:
     ---------------------
@@ -37,6 +52,7 @@ http://www.tuxpaint.org/
 
     * Updated `src/po/check_translations.sh` sanity-checking script
       so it properly finds the updated docs & other changes.
+      Bill Kendrick <bill@newbreedsoftware.com>
 
   * Bug Fixes:
     ----------
@@ -54,12 +70,20 @@ http://www.tuxpaint.org/
       (useful for automated installation/uninsta$llation processes).
       TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
 
+    * On macOS, use the CMD (⌘) key wherever CTRL is used on other OSes
+      Mark Kim <markuskimius@gmail.com>
+
     * Use character class in macOS build script
       (It appears \t is not compatible with certain versions of grep.)
-      Mark K. Kim <markuskimius@gmail.com>
+      Mark Kim <markuskimius@gmail.com>
 
     * Remove install stages not needed on macOS
-      Mark K. Kim <markuskimius@gmail.com>
+      Mark Kim <markuskimius@gmail.com>
+
+  * Documentation updates:
+    ---------------------
+    * macOS Apple Silicon and Universal Binary build instructions
+      Mark Kim <markuskimius@gmail.com>
 
 
 2021.November.25 (0.9.27)