Manually cherry-pick xibosignage/xibo#2117
Manually cherry-pick xibosignage/xibo#2117

dasgarner/xibo-cms,xibosignage/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms,xibosignage/xibo-cms,xibosignage/xibo-cms,alexharrington/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms,dasgarner/xibo-cms,alexharrington/xibo-cms,alexharrington/xibo-cms,dasgarner/xibo-cms,alexharrington/xibo-cms,alexharrington/xibo-cms