Merge request: https://gitlab.riscosopen.org/RiscOS/BuildSys/merge_requests/refs/merge-requests/23/head
