It's beginning to look a lot like Christmas...

same as old PR here:
https://github.com/Baystation12/Baystation12/pull/404