Merge branch 'tabbar' into tabbar-dev

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-custom: ["https://paypal.me/jonbm78", "https://www.paypal.com/paypalme/jonbm78"]