Merge branch 'master' into master

diff --cc .gitmodules
index 85026ea9800e98a97e8a765519d193c975923d61,188be13a5fd1024efae0eac518e1b1d86e159d11..f6849fbc094f2c9a7b6665edd0d8ca580a4d879d
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -108,6 -108,15 +108,21 @@@
  [submodule "static/stands/coderdojo_belgium"]
        path = static/stands/coderdojo_belgium
        url = https://github.com/valeriecdj/FosdemStatic.git
++
 +[submodule "content/stands/haiku"]
 +      path = content/stands/haiku
 +      url = https://github.com/pulkomandy/fosdem-stands-haiku.git
++
+ [submodule "static/stands/eclipse-foundation"]
+       path = static/stands/eclipse-foundation
+       url = https://github.com/EclipseFdn/fosdem2021-static.git
+ [submodule "content/stands/eclipse-foundation"]
+       path = content/stands/eclipse-foundation
+       url = https://github.com/EclipseFdn/fosdem2021-content.git
+ [submodule "content/stands/mariadb_foundation"]
+       path = content/stands/mariadb_foundation
+       url = https://github.com/MariaDB-FOSDEM/stand-content.git
+ [submodule "static/stands/mariadb_foundation"]
+       path = static/stands/mariadb_foundation
+       url = https://github.com/MariaDB-FOSDEM/stand-static.git
++