Synchronise with the Unix build.
2 files changed