Skip to content

Port 783f2757aa4f2896ade86eca905f6c510b809b37 from upstream

This will fix some build issues we're currently having. Just going to YOLO it though.

Merge request reports