Merge branch 'main' into feat/aqhi

# Conflicts:
#	CHANGELOG.md

src/data/dataCredits.js

@@ -270,7 +270,9 @@ export const DATA_CREDITS = [
   },
   {
     key: 'gbfs',
-    html: 'Bikeshare availability: GBFS operator feeds (e.g. Austin BCycle)',
+    html:
+      'Bikeshare availability: GBFS operator feeds ' +
+      '(e.g. Austin BCycle; Bike Share Toronto, operated by the Toronto Parking Authority)',
   },
   {
     key: 'urbansharing-gbfs',