Merge pull request #1172 from sjwilks/wingwing_mixer

Wing wing mixer