Merge of RISC OS Ltd version 2.41.
Kevin Bracey authored
Detail:
  Version from RISC OS 4.02 merged in manually - some sbrodie/sproven fixes
  were not present in ROL version.
Admin:
  Not tested.
  Tagged as FileSwitch-2_45.
dca282ce