Merged 6Wind patch.
3 files changed